diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 5edaa47f6c..fb813e4aec 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized - version = '1.66.0-dev' + version = '1.66.0-pre1' s.version = version s.summary = 'gRPC C++ library' s.homepage = 'https://grpc.io' @@ -254,6 +254,7 @@ Pod::Spec.new do |s| ss.dependency 'abseil/log/log', abseil_version ss.dependency 'abseil/memory/memory', abseil_version ss.dependency 'abseil/meta/type_traits', abseil_version + ss.dependency 'abseil/numeric/bits', abseil_version ss.dependency 'abseil/random/bit_gen_ref', abseil_version ss.dependency 'abseil/random/distributions', abseil_version ss.dependency 'abseil/random/random', abseil_version @@ -280,8 +281,10 @@ Pod::Spec.new do |s| 'src/core/client_channel/client_channel_service_config.h', 'src/core/client_channel/config_selector.h', 'src/core/client_channel/connector.h', + 'src/core/client_channel/direct_channel.h', 'src/core/client_channel/dynamic_filters.h', 'src/core/client_channel/global_subchannel_pool.h', + 'src/core/client_channel/lb_metadata.h', 'src/core/client_channel/load_balanced_call_destination.h', 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', @@ -950,7 +953,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h', 'src/core/lib/event_engine/thready_event_engine/thready_event_engine.h', 'src/core/lib/event_engine/time_util.h', - 'src/core/lib/event_engine/trace.h', 'src/core/lib/event_engine/utils.h', 'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h', 'src/core/lib/event_engine/windows/iocp.h', @@ -1176,7 +1178,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_internal.h', 'src/core/lib/slice/slice_refcount.h', 'src/core/lib/slice/slice_string_helpers.h', - 'src/core/lib/surface/api_trace.h', 'src/core/lib/surface/call.h', 'src/core/lib/surface/call_test_only.h', 'src/core/lib/surface/call_utils.h', @@ -1201,6 +1202,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/call_filters.h', 'src/core/lib/transport/call_final_info.h', 'src/core/lib/transport/call_spine.h', + 'src/core/lib/transport/call_state.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', @@ -1319,32 +1321,40 @@ Pod::Spec.new do |s| 'src/core/util/json/json_reader.h', 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', + 'src/core/util/latent_see.h', 'src/core/util/spinlock.h', 'src/core/util/string.h', 'src/core/util/time_precise.h', 'src/core/util/tmpfile.h', + 'src/core/util/upb_utils.h', 'src/core/util/useful.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', - 'src/core/xds/grpc/upb_utils.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', 'src/core/xds/grpc/xds_bootstrap_grpc.h', 'src/core/xds/grpc/xds_certificate_provider.h', 'src/core/xds/grpc/xds_client_grpc.h', 'src/core/xds/grpc/xds_cluster.h', + 'src/core/xds/grpc/xds_cluster_parser.h', 'src/core/xds/grpc/xds_cluster_specifier_plugin.h', 'src/core/xds/grpc/xds_common_types.h', + 'src/core/xds/grpc/xds_common_types_parser.h', 'src/core/xds/grpc/xds_enabled_server.h', 'src/core/xds/grpc/xds_endpoint.h', + 'src/core/xds/grpc/xds_endpoint_parser.h', 'src/core/xds/grpc/xds_health_status.h', 'src/core/xds/grpc/xds_http_fault_filter.h', - 'src/core/xds/grpc/xds_http_filters.h', + 'src/core/xds/grpc/xds_http_filter.h', + 'src/core/xds/grpc/xds_http_filter_registry.h', 'src/core/xds/grpc/xds_http_rbac_filter.h', 'src/core/xds/grpc/xds_http_stateful_session_filter.h', 'src/core/xds/grpc/xds_lb_policy_registry.h', 'src/core/xds/grpc/xds_listener.h', + 'src/core/xds/grpc/xds_listener_parser.h', 'src/core/xds/grpc/xds_route_config.h', + 'src/core/xds/grpc/xds_route_config_parser.h', 'src/core/xds/grpc/xds_routing.h', + 'src/core/xds/grpc/xds_server_grpc.h', 'src/core/xds/grpc/xds_transport_grpc.h', 'src/core/xds/xds_client/xds_api.h', 'src/core/xds/xds_client/xds_bootstrap.h', @@ -1463,6 +1473,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/copy.h', 'third_party/upb/upb/message/internal/accessors.h', 'third_party/upb/upb/message/internal/array.h', + 'third_party/upb/upb/message/internal/compare_unknown.h', 'third_party/upb/upb/message/internal/extension.h', 'third_party/upb/upb/message/internal/map.h', 'third_party/upb/upb/message/internal/map_entry.h', @@ -1571,8 +1582,10 @@ Pod::Spec.new do |s| 'src/core/client_channel/client_channel_service_config.h', 'src/core/client_channel/config_selector.h', 'src/core/client_channel/connector.h', + 'src/core/client_channel/direct_channel.h', 'src/core/client_channel/dynamic_filters.h', 'src/core/client_channel/global_subchannel_pool.h', + 'src/core/client_channel/lb_metadata.h', 'src/core/client_channel/load_balanced_call_destination.h', 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', @@ -2223,7 +2236,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h', 'src/core/lib/event_engine/thready_event_engine/thready_event_engine.h', 'src/core/lib/event_engine/time_util.h', - 'src/core/lib/event_engine/trace.h', 'src/core/lib/event_engine/utils.h', 'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h', 'src/core/lib/event_engine/windows/iocp.h', @@ -2449,7 +2461,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_internal.h', 'src/core/lib/slice/slice_refcount.h', 'src/core/lib/slice/slice_string_helpers.h', - 'src/core/lib/surface/api_trace.h', 'src/core/lib/surface/call.h', 'src/core/lib/surface/call_test_only.h', 'src/core/lib/surface/call_utils.h', @@ -2474,6 +2485,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/call_filters.h', 'src/core/lib/transport/call_final_info.h', 'src/core/lib/transport/call_spine.h', + 'src/core/lib/transport/call_state.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', @@ -2592,32 +2604,40 @@ Pod::Spec.new do |s| 'src/core/util/json/json_reader.h', 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', + 'src/core/util/latent_see.h', 'src/core/util/spinlock.h', 'src/core/util/string.h', 'src/core/util/time_precise.h', 'src/core/util/tmpfile.h', + 'src/core/util/upb_utils.h', 'src/core/util/useful.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', - 'src/core/xds/grpc/upb_utils.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', 'src/core/xds/grpc/xds_bootstrap_grpc.h', 'src/core/xds/grpc/xds_certificate_provider.h', 'src/core/xds/grpc/xds_client_grpc.h', 'src/core/xds/grpc/xds_cluster.h', + 'src/core/xds/grpc/xds_cluster_parser.h', 'src/core/xds/grpc/xds_cluster_specifier_plugin.h', 'src/core/xds/grpc/xds_common_types.h', + 'src/core/xds/grpc/xds_common_types_parser.h', 'src/core/xds/grpc/xds_enabled_server.h', 'src/core/xds/grpc/xds_endpoint.h', + 'src/core/xds/grpc/xds_endpoint_parser.h', 'src/core/xds/grpc/xds_health_status.h', 'src/core/xds/grpc/xds_http_fault_filter.h', - 'src/core/xds/grpc/xds_http_filters.h', + 'src/core/xds/grpc/xds_http_filter.h', + 'src/core/xds/grpc/xds_http_filter_registry.h', 'src/core/xds/grpc/xds_http_rbac_filter.h', 'src/core/xds/grpc/xds_http_stateful_session_filter.h', 'src/core/xds/grpc/xds_lb_policy_registry.h', 'src/core/xds/grpc/xds_listener.h', + 'src/core/xds/grpc/xds_listener_parser.h', 'src/core/xds/grpc/xds_route_config.h', + 'src/core/xds/grpc/xds_route_config_parser.h', 'src/core/xds/grpc/xds_routing.h', + 'src/core/xds/grpc/xds_server_grpc.h', 'src/core/xds/grpc/xds_transport_grpc.h', 'src/core/xds/xds_client/xds_api.h', 'src/core/xds/xds_client/xds_bootstrap.h', @@ -2687,6 +2707,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/copy.h', 'third_party/upb/upb/message/internal/accessors.h', 'third_party/upb/upb/message/internal/array.h', + 'third_party/upb/upb/message/internal/compare_unknown.h', 'third_party/upb/upb/message/internal/extension.h', 'third_party/upb/upb/message/internal/map.h', 'third_party/upb/upb/message/internal/map_entry.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index ad2f3920c3..1483009530 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.66.0-dev' + version = '1.66.0-pre1' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' @@ -199,7 +199,7 @@ Pod::Spec.new do |s| ss.libraries = 'z' ss.dependency "#{s.name}/Interface", version ss.dependency "#{s.name}/Privacy", version - ss.dependency 'BoringSSL-GRPC', '0.0.35' + ss.dependency 'BoringSSL-GRPC', '0.0.36' ss.dependency 'abseil/algorithm/container', abseil_version ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/config', abseil_version @@ -221,6 +221,7 @@ Pod::Spec.new do |s| ss.dependency 'abseil/log/log', abseil_version ss.dependency 'abseil/memory/memory', abseil_version ss.dependency 'abseil/meta/type_traits', abseil_version + ss.dependency 'abseil/numeric/bits', abseil_version ss.dependency 'abseil/random/bit_gen_ref', abseil_version ss.dependency 'abseil/random/distributions', abseil_version ss.dependency 'abseil/random/random', abseil_version @@ -257,10 +258,14 @@ Pod::Spec.new do |s| 'src/core/client_channel/client_channel_service_config.h', 'src/core/client_channel/config_selector.h', 'src/core/client_channel/connector.h', + 'src/core/client_channel/direct_channel.cc', + 'src/core/client_channel/direct_channel.h', 'src/core/client_channel/dynamic_filters.cc', 'src/core/client_channel/dynamic_filters.h', 'src/core/client_channel/global_subchannel_pool.cc', 'src/core/client_channel/global_subchannel_pool.h', + 'src/core/client_channel/lb_metadata.cc', + 'src/core/client_channel/lb_metadata.h', 'src/core/client_channel/load_balanced_call_destination.cc', 'src/core/client_channel/load_balanced_call_destination.h', 'src/core/client_channel/local_subchannel_pool.cc', @@ -1335,7 +1340,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/thready_event_engine/thready_event_engine.h', 'src/core/lib/event_engine/time_util.cc', 'src/core/lib/event_engine/time_util.h', - 'src/core/lib/event_engine/trace.h', 'src/core/lib/event_engine/utils.cc', 'src/core/lib/event_engine/utils.h', 'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc', @@ -1753,7 +1757,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_refcount.h', 'src/core/lib/slice/slice_string_helpers.cc', 'src/core/lib/slice/slice_string_helpers.h', - 'src/core/lib/surface/api_trace.h', 'src/core/lib/surface/byte_buffer.cc', 'src/core/lib/surface/byte_buffer_reader.cc', 'src/core/lib/surface/call.cc', @@ -1806,6 +1809,8 @@ Pod::Spec.new do |s| 'src/core/lib/transport/call_final_info.h', 'src/core/lib/transport/call_spine.cc', 'src/core/lib/transport/call_spine.h', + 'src/core/lib/transport/call_state.cc', + 'src/core/lib/transport/call_state.h', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', @@ -2041,6 +2046,8 @@ Pod::Spec.new do |s| 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.cc', 'src/core/util/json/json_writer.h', + 'src/core/util/latent_see.cc', + 'src/core/util/latent_see.h', 'src/core/util/linux/cpu.cc', 'src/core/util/linux/log.cc', 'src/core/util/log.cc', @@ -2060,6 +2067,7 @@ Pod::Spec.new do |s| 'src/core/util/time_precise.cc', 'src/core/util/time_precise.h', 'src/core/util/tmpfile.h', + 'src/core/util/upb_utils.h', 'src/core/util/useful.h', 'src/core/util/windows/cpu.cc', 'src/core/util/windows/log.cc', @@ -2072,7 +2080,6 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.cc', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', - 'src/core/xds/grpc/upb_utils.h', 'src/core/xds/grpc/xds_audit_logger_registry.cc', 'src/core/xds/grpc/xds_audit_logger_registry.h', 'src/core/xds/grpc/xds_bootstrap_grpc.cc', @@ -2083,18 +2090,25 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_client_grpc.h', 'src/core/xds/grpc/xds_cluster.cc', 'src/core/xds/grpc/xds_cluster.h', + 'src/core/xds/grpc/xds_cluster_parser.cc', + 'src/core/xds/grpc/xds_cluster_parser.h', 'src/core/xds/grpc/xds_cluster_specifier_plugin.cc', 'src/core/xds/grpc/xds_cluster_specifier_plugin.h', 'src/core/xds/grpc/xds_common_types.cc', 'src/core/xds/grpc/xds_common_types.h', + 'src/core/xds/grpc/xds_common_types_parser.cc', + 'src/core/xds/grpc/xds_common_types_parser.h', 'src/core/xds/grpc/xds_endpoint.cc', 'src/core/xds/grpc/xds_endpoint.h', + 'src/core/xds/grpc/xds_endpoint_parser.cc', + 'src/core/xds/grpc/xds_endpoint_parser.h', 'src/core/xds/grpc/xds_health_status.cc', 'src/core/xds/grpc/xds_health_status.h', 'src/core/xds/grpc/xds_http_fault_filter.cc', 'src/core/xds/grpc/xds_http_fault_filter.h', - 'src/core/xds/grpc/xds_http_filters.cc', - 'src/core/xds/grpc/xds_http_filters.h', + 'src/core/xds/grpc/xds_http_filter.h', + 'src/core/xds/grpc/xds_http_filter_registry.cc', + 'src/core/xds/grpc/xds_http_filter_registry.h', 'src/core/xds/grpc/xds_http_rbac_filter.cc', 'src/core/xds/grpc/xds_http_rbac_filter.h', 'src/core/xds/grpc/xds_http_stateful_session_filter.cc', @@ -2103,10 +2117,16 @@ Pod::Spec.new do |s| 'src/core/xds/grpc/xds_lb_policy_registry.h', 'src/core/xds/grpc/xds_listener.cc', 'src/core/xds/grpc/xds_listener.h', + 'src/core/xds/grpc/xds_listener_parser.cc', + 'src/core/xds/grpc/xds_listener_parser.h', 'src/core/xds/grpc/xds_route_config.cc', 'src/core/xds/grpc/xds_route_config.h', + 'src/core/xds/grpc/xds_route_config_parser.cc', + 'src/core/xds/grpc/xds_route_config_parser.h', 'src/core/xds/grpc/xds_routing.cc', 'src/core/xds/grpc/xds_routing.h', + 'src/core/xds/grpc/xds_server_grpc.cc', + 'src/core/xds/grpc/xds_server_grpc.h', 'src/core/xds/grpc/xds_transport_grpc.cc', 'src/core/xds/grpc/xds_transport_grpc.h', 'src/core/xds/xds_client/xds_api.cc', @@ -2206,6 +2226,8 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/copy.h', 'third_party/upb/upb/message/internal/accessors.h', 'third_party/upb/upb/message/internal/array.h', + 'third_party/upb/upb/message/internal/compare_unknown.c', + 'third_party/upb/upb/message/internal/compare_unknown.h', 'third_party/upb/upb/message/internal/extension.c', 'third_party/upb/upb/message/internal/extension.h', 'third_party/upb/upb/message/internal/map.h', @@ -2361,8 +2383,10 @@ Pod::Spec.new do |s| 'src/core/client_channel/client_channel_service_config.h', 'src/core/client_channel/config_selector.h', 'src/core/client_channel/connector.h', + 'src/core/client_channel/direct_channel.h', 'src/core/client_channel/dynamic_filters.h', 'src/core/client_channel/global_subchannel_pool.h', + 'src/core/client_channel/lb_metadata.h', 'src/core/client_channel/load_balanced_call_destination.h', 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', @@ -2993,7 +3017,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h', 'src/core/lib/event_engine/thready_event_engine/thready_event_engine.h', 'src/core/lib/event_engine/time_util.h', - 'src/core/lib/event_engine/trace.h', 'src/core/lib/event_engine/utils.h', 'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h', 'src/core/lib/event_engine/windows/iocp.h', @@ -3219,7 +3242,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_internal.h', 'src/core/lib/slice/slice_refcount.h', 'src/core/lib/slice/slice_string_helpers.h', - 'src/core/lib/surface/api_trace.h', 'src/core/lib/surface/call.h', 'src/core/lib/surface/call_test_only.h', 'src/core/lib/surface/call_utils.h', @@ -3244,6 +3266,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/call_filters.h', 'src/core/lib/transport/call_final_info.h', 'src/core/lib/transport/call_spine.h', + 'src/core/lib/transport/call_state.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', @@ -3362,31 +3385,39 @@ Pod::Spec.new do |s| 'src/core/util/json/json_reader.h', 'src/core/util/json/json_util.h', 'src/core/util/json/json_writer.h', + 'src/core/util/latent_see.h', 'src/core/util/spinlock.h', 'src/core/util/string.h', 'src/core/util/time_precise.h', 'src/core/util/tmpfile.h', + 'src/core/util/upb_utils.h', 'src/core/util/useful.h', 'src/core/xds/grpc/certificate_provider_store.h', 'src/core/xds/grpc/file_watcher_certificate_provider_factory.h', - 'src/core/xds/grpc/upb_utils.h', 'src/core/xds/grpc/xds_audit_logger_registry.h', 'src/core/xds/grpc/xds_bootstrap_grpc.h', 'src/core/xds/grpc/xds_certificate_provider.h', 'src/core/xds/grpc/xds_client_grpc.h', 'src/core/xds/grpc/xds_cluster.h', + 'src/core/xds/grpc/xds_cluster_parser.h', 'src/core/xds/grpc/xds_cluster_specifier_plugin.h', 'src/core/xds/grpc/xds_common_types.h', + 'src/core/xds/grpc/xds_common_types_parser.h', 'src/core/xds/grpc/xds_endpoint.h', + 'src/core/xds/grpc/xds_endpoint_parser.h', 'src/core/xds/grpc/xds_health_status.h', 'src/core/xds/grpc/xds_http_fault_filter.h', - 'src/core/xds/grpc/xds_http_filters.h', + 'src/core/xds/grpc/xds_http_filter.h', + 'src/core/xds/grpc/xds_http_filter_registry.h', 'src/core/xds/grpc/xds_http_rbac_filter.h', 'src/core/xds/grpc/xds_http_stateful_session_filter.h', 'src/core/xds/grpc/xds_lb_policy_registry.h', 'src/core/xds/grpc/xds_listener.h', + 'src/core/xds/grpc/xds_listener_parser.h', 'src/core/xds/grpc/xds_route_config.h', + 'src/core/xds/grpc/xds_route_config_parser.h', 'src/core/xds/grpc/xds_routing.h', + 'src/core/xds/grpc/xds_server_grpc.h', 'src/core/xds/grpc/xds_transport_grpc.h', 'src/core/xds/xds_client/xds_api.h', 'src/core/xds/xds_client/xds_bootstrap.h', @@ -3445,6 +3476,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/message/copy.h', 'third_party/upb/upb/message/internal/accessors.h', 'third_party/upb/upb/message/internal/array.h', + 'third_party/upb/upb/message/internal/compare_unknown.h', 'third_party/upb/upb/message/internal/extension.h', 'third_party/upb/upb/message/internal/map.h', 'third_party/upb/upb/message/internal/map_entry.h', diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index 1451bccfff..fb045fc2e5 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.66.0-dev' + version = '1.66.0-pre1' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index da3eb9d32d..a4bc3c3c89 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.66.0-dev' + version = '1.66.0-pre1' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' diff --git a/gRPC.podspec b/gRPC.podspec index 7744e14cc3..fee89f18d1 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.66.0-dev' + version = '1.66.0-pre1' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h index add6593aa7..21a0c1c482 100644 --- a/include/grpc/event_engine/event_engine.h +++ b/include/grpc/event_engine/event_engine.h @@ -503,6 +503,20 @@ bool operator!=(const EventEngine::ConnectionHandle& lhs, std::ostream& operator<<(std::ostream& out, const EventEngine::ConnectionHandle& handle); +namespace detail { +std::string FormatHandleString(uint64_t key1, uint64_t key2); +} + +template +void AbslStringify(Sink& out, const EventEngine::ConnectionHandle& handle) { + out.Append(detail::FormatHandleString(handle.keys[0], handle.keys[1])); +} + +template +void AbslStringify(Sink& out, const EventEngine::TaskHandle& handle) { + out.Append(detail::FormatHandleString(handle.keys[0], handle.keys[1])); +} + } // namespace experimental } // namespace grpc_event_engine diff --git a/include/grpc/event_engine/extensible.h b/include/grpc/event_engine/extensible.h index 51812f935c..9af4f37682 100644 --- a/include/grpc/event_engine/extensible.h +++ b/include/grpc/event_engine/extensible.h @@ -60,6 +60,9 @@ class Extensible { /// if (endpoint != nullptr) endpoint->Process(); /// virtual void* QueryExtension(absl::string_view /*id*/) { return nullptr; } + + protected: + ~Extensible() = default; }; } // namespace experimental diff --git a/include/grpc/event_engine/memory_request.h b/include/grpc/event_engine/memory_request.h index 2018b3d476..2ea7bc5c1a 100644 --- a/include/grpc/event_engine/memory_request.h +++ b/include/grpc/event_engine/memory_request.h @@ -46,6 +46,24 @@ class MemoryRequest { size_t min() const { return min_; } size_t max() const { return max_; } + bool operator==(const MemoryRequest& other) const { + return min_ == other.min_ && max_ == other.max_; + } + bool operator!=(const MemoryRequest& other) const { + return !(*this == other); + } + + template + friend void AbslStringify(Sink& s, const MemoryRequest& r) { + if (r.min_ == r.max_) { + s.Append(r.min_); + } else { + s.Append(r.min_); + s.Append(".."); + s.Append(r.max_); + } + } + private: size_t min_; size_t max_; diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h index e5d8172982..7df1969f1b 100644 --- a/include/grpc/support/log.h +++ b/include/grpc/support/log.h @@ -28,15 +28,10 @@ extern "C" { #endif -/** GPR log API. - - Usage (within grpc): - - int argument1 = 3; - char* argument2 = "hello"; - gpr_log(GPR_DEBUG, "format string %d", argument1); - gpr_log(GPR_INFO, "hello world"); - gpr_log(GPR_ERROR, "%d %s!!", argument1, argument2); */ +/** + * Logging functions in this file are deprecated. + * Please use absl ABSL_LOG instead. + */ /** The severity of a log message - use the #defines below when calling into gpr_log to additionally supply file and line data */ @@ -46,9 +41,6 @@ typedef enum gpr_log_severity { GPR_LOG_SEVERITY_ERROR } gpr_log_severity; -/** Returns a string representation of the log severity */ -GPRAPI const char* gpr_log_severity_string(gpr_log_severity severity); - /** Macros to build log contexts at various severity levels */ #define GPR_DEBUG __FILE__, __LINE__, GPR_LOG_SEVERITY_DEBUG #define GPR_INFO __FILE__, __LINE__, GPR_LOG_SEVERITY_INFO @@ -65,7 +57,7 @@ GPRAPI void gpr_log_message(const char* file, int line, gpr_log_severity severity, const char* message); /** Set global log verbosity */ -GPRAPI void gpr_set_log_verbosity(gpr_log_severity min_severity_to_print); +GPRAPI void gpr_set_log_verbosity(gpr_log_severity deprecated_setting); GPRAPI void gpr_log_verbosity_init(void); @@ -83,10 +75,7 @@ typedef struct gpr_log_func_args gpr_log_func_args; typedef void (*gpr_log_func)(gpr_log_func_args* args); -GPRAPI void gpr_set_log_function(gpr_log_func func); - -GPRAPI void gpr_assertion_failed(const char* filename, int line, - const char* message) GPR_ATTRIBUTE_NORETURN; +GPRAPI void gpr_set_log_function(gpr_log_func deprecated_setting); #ifdef __cplusplus } diff --git a/include/grpc/support/metrics.h b/include/grpc/support/metrics.h index 7462e6aba6..829db0a404 100644 --- a/include/grpc/support/metrics.h +++ b/include/grpc/support/metrics.h @@ -17,6 +17,7 @@ #include "absl/strings/string_view.h" +#include #include namespace grpc_core { @@ -26,9 +27,10 @@ namespace experimental { // plugins. class StatsPluginChannelScope { public: - StatsPluginChannelScope(absl::string_view target, - absl::string_view default_authority) - : target_(target), default_authority_(default_authority) {} + StatsPluginChannelScope( + absl::string_view target, absl::string_view default_authority, + const grpc_event_engine::experimental::EndpointConfig& args) + : target_(target), default_authority_(default_authority), args_(args) {} /// Returns the target used for creating the channel in the canonical form. /// (Canonicalized target definition - @@ -36,13 +38,22 @@ class StatsPluginChannelScope { absl::string_view target() const { return target_; } /// Returns the default authority for the channel. absl::string_view default_authority() const { return default_authority_; } + /// Returns channel arguments. THIS METHOD IS EXPERIMENTAL. + // TODO(roth, ctiller, yashkt): Find a better representation for + // channel args before de-experimentalizing this API. + const grpc_event_engine::experimental::EndpointConfig& experimental_args() + const { + return args_; + } private: // Disable copy constructor and copy-assignment operator. StatsPluginChannelScope(const StatsPluginChannelScope&) = delete; StatsPluginChannelScope& operator=(const StatsPluginChannelScope&) = delete; + absl::string_view target_; absl::string_view default_authority_; + const grpc_event_engine::experimental::EndpointConfig& args_; }; } // namespace experimental diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h index e261bb1242..5fb7426af2 100644 --- a/include/grpc/support/port_platform.h +++ b/include/grpc/support/port_platform.h @@ -746,6 +746,22 @@ extern void gpr_unreachable_code(const char* reason, const char* file, #endif #endif /* GPR_ATTRIBUTE_NOINLINE */ +#ifndef GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION +#ifdef __cplusplus +#if GPR_HAS_CPP_ATTRIBUTE(clang::always_inline) +#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION [[clang::always_inline]] +#elif GPR_HAS_ATTRIBUTE(always_inline) +#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION __attribute__((always_inline)) +#else +// TODO(ctiller): add __forceinline for MSVC +#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION +#endif +#else +// Disable for C code +#define GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION +#endif +#endif /* GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION */ + #ifndef GPR_NO_UNIQUE_ADDRESS #if GPR_HAS_CPP_ATTRIBUTE(no_unique_address) #define GPR_NO_UNIQUE_ADDRESS [[no_unique_address]] @@ -820,6 +836,12 @@ extern void gpr_unreachable_code(const char* reason, const char* file, #endif /* __GPR_WINDOWS */ #endif /* GRPC_ALLOW_EXCEPTIONS */ +#ifdef __has_builtin +#define GRPC_HAS_BUILTIN(a) __has_builtin(a) +#else +#define GRPC_HAS_BUILTIN(a) 0 +#endif + /* Use GPR_LIKELY only in cases where you are sure that a certain outcome is the * most likely. Ideally, also collect performance numbers to justify the claim. */ diff --git a/include/grpcpp/security/server_credentials.h b/include/grpcpp/security/server_credentials.h index e3f5c2bbbf..aa602cf4e6 100644 --- a/include/grpcpp/security/server_credentials.h +++ b/include/grpcpp/security/server_credentials.h @@ -116,9 +116,6 @@ std::shared_ptr AltsServerCredentials( const AltsServerCredentialsOptions& options); /// Builds Local ServerCredentials. -std::shared_ptr AltsServerCredentials( - const AltsServerCredentialsOptions& options); - std::shared_ptr LocalServerCredentials( grpc_local_connect_type type); diff --git a/include/grpcpp/version_info.h b/include/grpcpp/version_info.h index dfab77a302..e92325c1e9 100644 --- a/include/grpcpp/version_info.h +++ b/include/grpcpp/version_info.h @@ -21,7 +21,7 @@ #define GRPC_CPP_VERSION_MAJOR 1 #define GRPC_CPP_VERSION_MINOR 66 #define GRPC_CPP_VERSION_PATCH 0 -#define GRPC_CPP_VERSION_TAG "dev" -#define GRPC_CPP_VERSION_STRING "1.66.0-dev" +#define GRPC_CPP_VERSION_TAG "pre1" +#define GRPC_CPP_VERSION_STRING "1.66.0-pre1" #endif // GRPCPP_VERSION_INFO_H diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index 87a66c75d9..5e1e2ec8eb 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -28,6 +28,7 @@ #include #include "absl/cleanup/cleanup.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/cord.h" @@ -43,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -61,6 +61,7 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/sync.h" @@ -73,6 +74,7 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/sleep.h" #include "src/core/lib/promise/try_seq.h" +#include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" @@ -283,10 +285,10 @@ class ClientChannel::SubchannelWrapper::WatcherWrapper } } } else { - gpr_log(GPR_ERROR, - "client_channel=%p: Illegal keepalive throttling value %s", - subchannel_wrapper_->client_channel_.get(), - std::string(keepalive_throttling.value()).c_str()); + LOG(ERROR) << "client_channel=" + << subchannel_wrapper_->client_channel_.get() + << ": Illegal keepalive throttling value " + << std::string(keepalive_throttling.value()); } } // Propagate status only in state TF. @@ -453,10 +455,10 @@ class ClientChannel::ClientChannelControlHelper const char* extra = client_channel_->disconnect_error_.ok() ? "" : " (ignoring -- channel shutting down)"; - gpr_log(GPR_INFO, - "client_channel=%p: update: state=%s status=(%s) picker=%p%s", - client_channel_.get(), ConnectivityStateName(state), - status.ToString().c_str(), picker.get(), extra); + LOG(INFO) << "client_channel=" << client_channel_.get() + << ": update: state=" << ConnectivityStateName(state) + << " status=(" << status << ") picker=" << picker.get() + << extra; } // Do update only if not shutting down. if (client_channel_->disconnect_error_.ok()) { @@ -625,6 +627,7 @@ ClientChannel::ClientChannel( work_serializer_(std::make_shared(event_engine_)), state_tracker_("client_channel", GRPC_CHANNEL_IDLE), subchannel_pool_(GetSubchannelPool(channel_args_)) { + CHECK(event_engine_.get() != nullptr); GRPC_TRACE_LOG(client_channel, INFO) << "client_channel=" << this << ": creating client_channel"; // Set initial keepalive time. @@ -635,8 +638,10 @@ ClientChannel::ClientChannel( keepalive_time_ = -1; // unset } // Get stats plugins for channel. - experimental::StatsPluginChannelScope scope(this->target(), - default_authority_); + grpc_event_engine::experimental::ChannelArgsEndpointConfig endpoint_config( + channel_args_); + experimental::StatsPluginChannelScope scope( + this->target(), default_authority_, endpoint_config); stats_plugin_group_ = GlobalStatsPluginRegistry::GetStatsPluginsForChannel(scope); } @@ -683,10 +688,93 @@ grpc_connectivity_state ClientChannel::CheckConnectivityState( return state; } -void ClientChannel::WatchConnectivityState(grpc_connectivity_state, Timestamp, - grpc_completion_queue*, void*) { - // TODO(ctiller): implement - Crash("not implemented"); +namespace { + +// A fire-and-forget object to handle external connectivity state watches. +class ExternalStateWatcher : public RefCounted { + public: + ExternalStateWatcher(WeakRefCountedPtr channel, + grpc_completion_queue* cq, void* tag, + grpc_connectivity_state last_observed_state, + Timestamp deadline) + : channel_(std::move(channel)), cq_(cq), tag_(tag) { + MutexLock lock(&mu_); + // Start watch. This inherits the ref from creation. + auto watcher = + MakeOrphanable(RefCountedPtr(this)); + watcher_ = watcher.get(); + channel_->AddConnectivityWatcher(last_observed_state, std::move(watcher)); + // Start timer. This takes a second ref. + const Duration timeout = deadline - Timestamp::Now(); + timer_handle_ = + channel_->event_engine()->RunAfter(timeout, [self = Ref()]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->MaybeStartCompletion(absl::DeadlineExceededError( + "Timed out waiting for connection state change")); + // ExternalStateWatcher deletion might require an active ExecCtx. + self.reset(); + }); + } + + private: + class Watcher : public AsyncConnectivityStateWatcherInterface { + public: + explicit Watcher(RefCountedPtr external_state_watcher) + : external_state_watcher_(std::move(external_state_watcher)) {} + + void OnConnectivityStateChange(grpc_connectivity_state /*new_state*/, + const absl::Status& /*status*/) override { + external_state_watcher_->MaybeStartCompletion(absl::OkStatus()); + } + + private: + RefCountedPtr external_state_watcher_; + }; + + // This is called both when the watch reports a new connectivity state + // and when the timer fires. It will trigger a CQ notification only + // on the first call. Subsequent calls will be ignored, because + // events can come in asynchronously. + void MaybeStartCompletion(absl::Status status) { + MutexLock lock(&mu_); + if (watcher_ == nullptr) return; // Ignore subsequent notifications. + // Cancel watch. + channel_->RemoveConnectivityWatcher(watcher_); + watcher_ = nullptr; + // Cancel timer. + channel_->event_engine()->Cancel(timer_handle_); + // Send CQ completion. + Ref().release(); // Released in FinishedCompletion(). + grpc_cq_end_op(cq_, tag_, status, FinishedCompletion, this, + &completion_storage_); + } + + // Called when the completion is returned to the CQ. + static void FinishedCompletion(void* arg, grpc_cq_completion* /*ignored*/) { + auto* self = static_cast(arg); + self->Unref(); + } + + WeakRefCountedPtr channel_; + + Mutex mu_; + grpc_completion_queue* cq_ ABSL_GUARDED_BY(&mu_); + void* tag_ ABSL_GUARDED_BY(&mu_); + grpc_cq_completion completion_storage_ ABSL_GUARDED_BY(&mu_); + Watcher* watcher_ ABSL_GUARDED_BY(&mu_) = nullptr; + grpc_event_engine::experimental::EventEngine::TaskHandle timer_handle_ + ABSL_GUARDED_BY(&mu_); +}; + +} // namespace + +void ClientChannel::WatchConnectivityState(grpc_connectivity_state state, + Timestamp deadline, + grpc_completion_queue* cq, + void* tag) { + new ExternalStateWatcher(WeakRefAsSubclass(), cq, tag, state, + deadline); } void ClientChannel::AddConnectivityWatcher( @@ -768,10 +856,12 @@ grpc_call* ClientChannel::CreateCall( grpc_call* parent_call, uint32_t propagation_mask, grpc_completion_queue* cq, grpc_pollset_set* /*pollset_set_alternative*/, Slice path, absl::optional authority, Timestamp deadline, bool) { + auto arena = call_arena_allocator()->MakeArena(); + arena->SetContext( + event_engine()); return MakeClientCall(parent_call, propagation_mask, cq, std::move(path), std::move(authority), false, deadline, - compression_options(), event_engine_.get(), - call_arena_allocator()->MakeArena(), Ref()); + compression_options(), std::move(arena), Ref()); } void ClientChannel::StartCall(UnstartedCallHandler unstarted_handler) { @@ -907,15 +997,13 @@ RefCountedPtr ChooseLbPolicy( .LoadBalancingPolicyExists(*policy_name, &requires_config) || requires_config)) { if (requires_config) { - gpr_log(GPR_ERROR, - "LB policy: %s passed through channel_args must not " - "require a config. Using pick_first instead.", - std::string(*policy_name).c_str()); + LOG(ERROR) << "LB policy: " << *policy_name + << " passed through channel_args must not " + "require a config. Using pick_first instead."; } else { - gpr_log(GPR_ERROR, - "LB policy: %s passed through channel_args does not exist. " - "Using pick_first instead.", - std::string(*policy_name).c_str()); + LOG(ERROR) << "LB policy: " << *policy_name + << " passed through channel_args does not exist. " + "Using pick_first instead."; } policy_name = "pick_first"; } @@ -1257,6 +1345,9 @@ void ClientChannel::StartIdleTimer() { } }); }); + auto arena = SimpleArenaAllocator(0)->MakeArena(); + arena->SetContext( + event_engine()); idle_activity_.Set(MakeActivity( std::move(promise), ExecCtxWakeupScheduler{}, [self = std::move(self)](absl::Status status) mutable { @@ -1268,13 +1359,14 @@ void ClientChannel::StartIdleTimer() { GRPC_CHANNEL_IDLE, absl::OkStatus(), "channel entering IDLE", nullptr); // TODO(roth): In case there's a race condition, we - // might need to check for any calls that are queued - // waiting for a resolver result or an LB pick. + // might need to check for any calls that are + // queued waiting for a resolver result or an LB + // pick. }, DEBUG_LOCATION); } }, - GetContext())); + std::move(arena))); } absl::Status ClientChannel::ApplyServiceConfigToCall( diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 84724d63df..0443002c52 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -31,6 +31,7 @@ #include "absl/cleanup/cleanup.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/cord.h" @@ -46,7 +47,6 @@ #include #include #include -#include #include #include @@ -57,6 +57,7 @@ #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/dynamic_filters.h" #include "src/core/client_channel/global_subchannel_pool.h" +#include "src/core/client_channel/lb_metadata.h" #include "src/core/client_channel/local_subchannel_pool.h" #include "src/core/client_channel/retry_filter.h" #include "src/core/client_channel/subchannel.h" @@ -316,7 +317,7 @@ const grpc_channel_filter ClientChannelFilter::kFilter = { grpc_channel_stack_no_post_init, ClientChannelFilter::Destroy, ClientChannelFilter::GetChannelInfo, - "client-channel", + GRPC_UNIQUE_TYPE_NAME_HERE("client-channel"), }; // @@ -443,7 +444,7 @@ const grpc_channel_filter DynamicTerminationFilter::kFilterVtable = { grpc_channel_stack_no_post_init, DynamicTerminationFilter::Destroy, DynamicTerminationFilter::GetChannelInfo, - "dynamic_filter_termination", + GRPC_UNIQUE_TYPE_NAME_HERE("dynamic_filter_termination"), }; } // namespace @@ -705,9 +706,9 @@ class ClientChannelFilter::SubchannelWrapper final } } } else { - gpr_log(GPR_ERROR, "chand=%p: Illegal keepalive throttling value %s", - parent_->chand_, - std::string(keepalive_throttling.value()).c_str()); + LOG(ERROR) << "chand=" << parent_->chand_ + << ": Illegal keepalive throttling value " + << std::string(keepalive_throttling.value()); } } // Propagate status only in state TF. @@ -1210,15 +1211,13 @@ RefCountedPtr ChooseLbPolicy( .LoadBalancingPolicyExists(*policy_name, &requires_config) || requires_config)) { if (requires_config) { - gpr_log(GPR_ERROR, - "LB policy: %s passed through channel_args must not " - "require a config. Using pick_first instead.", - std::string(*policy_name).c_str()); + LOG(ERROR) << "LB policy: " << *policy_name + << " passed through channel_args must not " + "require a config. Using pick_first instead."; } else { - gpr_log(GPR_ERROR, - "LB policy: %s passed through channel_args does not exist. " - "Using pick_first instead.", - std::string(*policy_name).c_str()); + LOG(ERROR) << "LB policy: " << *policy_name + << " passed through channel_args does not exist. " + "Using pick_first instead."; } policy_name = "pick_first"; } @@ -2016,8 +2015,9 @@ void ClientChannelFilter::FilterBasedCallData::StartTransportStreamOpBatch( auto* chand = static_cast(elem->channel_data); if (GRPC_TRACE_FLAG_ENABLED(client_channel_call) && !GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: batch started from above: %s", chand, - calld, grpc_transport_stream_op_batch_string(batch, false).c_str()); + LOG(INFO) << "chand=" << chand << " calld=" << calld + << ": batch started from above: " + << grpc_transport_stream_op_batch_string(batch, false); } // Intercept recv_trailing_metadata to commit the call, in case we wind up // failing the call before we get down to the retry or LB call layer. @@ -2159,9 +2159,8 @@ void ClientChannelFilter::FilterBasedCallData::PendingBatchesFail( for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i] != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p calld=%p: failing %" PRIuPTR " pending batches: %s", - chand(), this, num_batches, StatusToString(error).c_str()); + LOG(INFO) << "chand=" << chand() << " calld=" << this << ": failing " + << num_batches << " pending batches: " << StatusToString(error); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2202,10 +2201,9 @@ void ClientChannelFilter::FilterBasedCallData::PendingBatchesResume() { for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i] != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p calld=%p: starting %" PRIuPTR - " pending batches on dynamic_call=%p", - chand(), this, num_batches, dynamic_call_.get()); + LOG(INFO) << "chand=" << chand() << " calld=" << this << ": starting " + << num_batches + << " pending batches on dynamic_call=" << dynamic_call_.get(); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2356,81 +2354,6 @@ class ClientChannelFilter::LoadBalancedCall::LbCallState final LoadBalancedCall* lb_call_; }; -// -// ClientChannelFilter::LoadBalancedCall::Metadata -// - -class ClientChannelFilter::LoadBalancedCall::Metadata final - : public LoadBalancingPolicy::MetadataInterface { - public: - explicit Metadata(grpc_metadata_batch* batch) : batch_(batch) {} - - void Add(absl::string_view key, absl::string_view value) override { - if (batch_ == nullptr) return; - // Gross, egregious hack to support legacy grpclb behavior. - // TODO(ctiller): Use a promise context for this once that plumbing is done. - if (key == GrpcLbClientStatsMetadata::key()) { - batch_->Set( - GrpcLbClientStatsMetadata(), - const_cast( - reinterpret_cast(value.data()))); - return; - } - batch_->Append(key, Slice::FromStaticString(value), - [key](absl::string_view error, const Slice& value) { - gpr_log(GPR_ERROR, "%s", - absl::StrCat(error, " key:", key, - " value:", value.as_string_view()) - .c_str()); - }); - } - - std::vector> TestOnlyCopyToVector() - override { - if (batch_ == nullptr) return {}; - Encoder encoder; - batch_->Encode(&encoder); - return encoder.Take(); - } - - absl::optional Lookup(absl::string_view key, - std::string* buffer) const override { - if (batch_ == nullptr) return absl::nullopt; - return batch_->GetStringValue(key, buffer); - } - - private: - class Encoder final { - public: - void Encode(const Slice& key, const Slice& value) { - out_.emplace_back(std::string(key.as_string_view()), - std::string(value.as_string_view())); - } - - template - void Encode(Which, const typename Which::ValueType& value) { - auto value_slice = Which::Encode(value); - out_.emplace_back(std::string(Which::key()), - std::string(value_slice.as_string_view())); - } - - void Encode(GrpcTimeoutMetadata, - const typename GrpcTimeoutMetadata::ValueType&) {} - void Encode(HttpPathMetadata, const Slice&) {} - void Encode(HttpMethodMetadata, - const typename HttpMethodMetadata::ValueType&) {} - - std::vector> Take() { - return std::move(out_); - } - - private: - std::vector> out_; - }; - - grpc_metadata_batch* batch_; -}; - // // ClientChannelFilter::LoadBalancedCall::LbCallState // @@ -2541,7 +2464,7 @@ void ClientChannelFilter::LoadBalancedCall::RecordCallCompletion( // If the LB policy requested a callback for trailing metadata, invoke // the callback. if (lb_subchannel_call_tracker_ != nullptr) { - Metadata trailing_metadata(recv_trailing_metadata); + LbMetadata trailing_metadata(recv_trailing_metadata); BackendMetricAccessor backend_metric_accessor(this, recv_trailing_metadata); LoadBalancingPolicy::SubchannelCallTrackerInterface::FinishArgs args = { peer_address, status, &trailing_metadata, &backend_metric_accessor}; @@ -2688,7 +2611,7 @@ bool ClientChannelFilter::LoadBalancedCall::PickSubchannelImpl( pick_args.path = path->as_string_view(); LbCallState lb_call_state(this); pick_args.call_state = &lb_call_state; - Metadata initial_metadata(send_initial_metadata()); + LbMetadata initial_metadata(send_initial_metadata()); pick_args.initial_metadata = &initial_metadata; auto result = picker->Pick(pick_args); return HandlePickResult( @@ -2721,6 +2644,11 @@ bool ClientChannelFilter::LoadBalancedCall::PickSubchannelImpl( if (lb_subchannel_call_tracker_ != nullptr) { lb_subchannel_call_tracker_->Start(); } + // Handle metadata mutations. + MetadataMutationHandler::Apply(complete_pick->metadata_mutations, + send_initial_metadata()); + MaybeOverrideAuthority(std::move(complete_pick->authority_override), + send_initial_metadata()); return true; }, // QueuePick @@ -2847,9 +2775,8 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall::PendingBatchesFail( for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i] != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p lb_call=%p: failing %" PRIuPTR " pending batches: %s", - chand(), this, num_batches, StatusToString(error).c_str()); + LOG(INFO) << "chand=" << chand() << " lb_call=" << this << ": failing " + << num_batches << " pending batches: " << StatusToString(error); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2889,10 +2816,9 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall::PendingBatchesResume() { for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { if (pending_batches_[i] != nullptr) ++num_batches; } - gpr_log(GPR_INFO, - "chand=%p lb_call=%p: starting %" PRIuPTR - " pending batches on subchannel_call=%p", - chand(), this, num_batches, subchannel_call_.get()); + LOG(INFO) << "chand=" << chand() << " lb_call=" << this << ": starting " + << num_batches << " pending batches on subchannel_call=" + << subchannel_call_.get(); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2915,12 +2841,10 @@ void ClientChannelFilter::FilterBasedLoadBalancedCall:: StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch) { if (GRPC_TRACE_FLAG_ENABLED(client_channel_lb_call) || GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "chand=%p lb_call=%p: batch started from above: %s, " - "call_attempt_tracer()=%p", - chand(), this, - grpc_transport_stream_op_batch_string(batch, false).c_str(), - call_attempt_tracer()); + LOG(INFO) << "chand=" << chand() << " lb_call=" << this + << ": batch started from above: " + << grpc_transport_stream_op_batch_string(batch, false) + << ", call_attempt_tracer()=" << call_attempt_tracer(); } // Handle call tracing. if (call_attempt_tracer() != nullptr) { diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h index 182da36319..f1982b6537 100644 --- a/src/core/client_channel/client_channel_internal.h +++ b/src/core/client_channel/client_channel_internal.h @@ -26,6 +26,7 @@ #include +#include "src/core/lib/gprpp/down_cast.h" #include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/call_destination.h" @@ -49,6 +50,11 @@ namespace grpc_core { // LB policies to access internal call attributes. class ClientChannelLbCallState : public LoadBalancingPolicy::CallState { public: + template + A* GetCallAttribute() const { + return DownCast(GetCallAttribute(A::TypeName())); + } + virtual ServiceConfigCallData::CallAttributeInterface* GetCallAttribute( UniqueTypeName type) const = 0; virtual ClientCallTracer::CallAttemptTracer* GetCallAttemptTracer() const = 0; diff --git a/src/core/client_channel/direct_channel.cc b/src/core/client_channel/direct_channel.cc new file mode 100644 index 0000000000..7a87774dc2 --- /dev/null +++ b/src/core/client_channel/direct_channel.cc @@ -0,0 +1,83 @@ +// Copyright 2024 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 "src/core/client_channel/direct_channel.h" + +#include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/event_engine/event_engine_context.h" +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/surface/client_call.h" +#include "src/core/lib/transport/interception_chain.h" + +namespace grpc_core { + +absl::StatusOr> DirectChannel::Create( + std::string target, const ChannelArgs& args) { + auto* transport = args.GetObject(); + if (transport == nullptr) { + return absl::InvalidArgumentError("Transport not set in ChannelArgs"); + } + if (transport->client_transport() == nullptr) { + return absl::InvalidArgumentError("Transport is not a client transport"); + } + auto transport_call_destination = MakeRefCounted( + OrphanablePtr(transport->client_transport())); + auto event_engine = + args.GetObjectRef(); + if (event_engine == nullptr) { + return absl::InvalidArgumentError("EventEngine not set in ChannelArgs"); + } + InterceptionChainBuilder builder(args); + CoreConfiguration::Get().channel_init().AddToInterceptionChainBuilder( + GRPC_CLIENT_DIRECT_CHANNEL, builder); + auto interception_chain = builder.Build(transport_call_destination); + if (!interception_chain.ok()) return interception_chain.status(); + return MakeRefCounted( + std::move(target), args, std::move(event_engine), + std::move(transport_call_destination), std::move(*interception_chain)); +} + +void DirectChannel::Orphaned() { + transport_call_destination_.reset(); + interception_chain_.reset(); +} + +void DirectChannel::StartCall(UnstartedCallHandler unstarted_handler) { + unstarted_handler.SpawnInfallible( + "start", + [interception_chain = interception_chain_, unstarted_handler]() mutable { + interception_chain->StartCall(std::move(unstarted_handler)); + return []() { return Empty{}; }; + }); +} + +void DirectChannel::GetInfo(const grpc_channel_info*) { + // TODO(roth): Implement this. +} + +grpc_call* DirectChannel::CreateCall( + grpc_call* parent_call, uint32_t propagation_mask, + grpc_completion_queue* cq, grpc_pollset_set* /*pollset_set_alternative*/, + Slice path, absl::optional authority, Timestamp deadline, + bool /*registered_method*/) { + auto arena = call_arena_allocator()->MakeArena(); + arena->SetContext( + event_engine_.get()); + return MakeClientCall(parent_call, propagation_mask, cq, std::move(path), + std::move(authority), false, deadline, + compression_options(), std::move(arena), Ref()); +} + +} // namespace grpc_core diff --git a/src/core/client_channel/direct_channel.h b/src/core/client_channel/direct_channel.h new file mode 100644 index 0000000000..e7b0ca6094 --- /dev/null +++ b/src/core/client_channel/direct_channel.h @@ -0,0 +1,101 @@ +// Copyright 2024 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_SRC_CORE_CLIENT_CHANNEL_DIRECT_CHANNEL_H +#define GRPC_SRC_CORE_CLIENT_CHANNEL_DIRECT_CHANNEL_H + +#include + +#include "src/core/lib/surface/channel.h" +#include "src/core/lib/transport/transport.h" + +namespace grpc_core { + +class DirectChannel final : public Channel { + public: + class TransportCallDestination final : public CallDestination { + public: + explicit TransportCallDestination(OrphanablePtr transport) + : transport_(std::move(transport)) {} + + ClientTransport* transport() { return transport_.get(); } + + void HandleCall(CallHandler handler) override { + transport_->StartCall(std::move(handler)); + } + + void Orphaned() override { transport_.reset(); } + + private: + OrphanablePtr transport_; + }; + + static absl::StatusOr> Create( + std::string target, const ChannelArgs& args); + + DirectChannel( + std::string target, const ChannelArgs& args, + std::shared_ptr + event_engine, + RefCountedPtr transport_call_destination, + RefCountedPtr interception_chain) + : Channel(std::move(target), args), + transport_call_destination_(std::move(transport_call_destination)), + interception_chain_(std::move(interception_chain)), + event_engine_(std::move(event_engine)) {} + + void Orphaned() override; + void StartCall(UnstartedCallHandler unstarted_handler) override; + bool IsLame() const override { return false; } + grpc_call* CreateCall(grpc_call* parent_call, uint32_t propagation_mask, + grpc_completion_queue* cq, + grpc_pollset_set* pollset_set_alternative, Slice path, + absl::optional authority, Timestamp deadline, + bool registered_method) override; + grpc_event_engine::experimental::EventEngine* event_engine() const override { + return event_engine_.get(); + } + bool SupportsConnectivityWatcher() const override { return false; } + grpc_connectivity_state CheckConnectivityState(bool) override { + Crash("CheckConnectivityState not supported"); + } + void WatchConnectivityState(grpc_connectivity_state, Timestamp, + grpc_completion_queue*, void*) override { + Crash("WatchConnectivityState not supported"); + } + void AddConnectivityWatcher( + grpc_connectivity_state, + OrphanablePtr) override { + Crash("AddConnectivityWatcher not supported"); + } + void RemoveConnectivityWatcher( + AsyncConnectivityStateWatcherInterface*) override { + Crash("RemoveConnectivityWatcher not supported"); + } + void GetInfo(const grpc_channel_info* channel_info) override; + void ResetConnectionBackoff() override {} + void Ping(grpc_completion_queue*, void*) override { + Crash("Ping not supported"); + } + + private: + RefCountedPtr transport_call_destination_; + RefCountedPtr interception_chain_; + const std::shared_ptr + event_engine_; +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_CLIENT_CHANNEL_DIRECT_CHANNEL_H diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc index f901cf8b9b..1e33da2105 100644 --- a/src/core/client_channel/dynamic_filters.cc +++ b/src/core/client_channel/dynamic_filters.cc @@ -78,7 +78,9 @@ void DynamicFilters::Call::StartTransportStreamOpBatch( grpc_transport_stream_op_batch* batch) { grpc_call_stack* call_stack = CALL_TO_CALL_STACK(this); grpc_call_element* top_elem = grpc_call_stack_element(call_stack, 0); - GRPC_CALL_LOG_OP(GPR_INFO, top_elem, batch); + GRPC_TRACE_LOG(channel, INFO) + << "OP[" << top_elem->filter->name << ":" << top_elem + << "]: " << grpc_transport_stream_op_batch_string(batch, false); top_elem->filter->start_transport_stream_op_batch(top_elem, batch); } diff --git a/src/core/client_channel/lb_metadata.cc b/src/core/client_channel/lb_metadata.cc new file mode 100644 index 0000000000..cbf2a98db0 --- /dev/null +++ b/src/core/client_channel/lb_metadata.cc @@ -0,0 +1,120 @@ +// Copyright 2024 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 "src/core/client_channel/lb_metadata.h" + +#include "absl/log/log.h" + +namespace grpc_core { + +// +// LbMetadata +// + +namespace { + +class Encoder { + public: + void Encode(const Slice& key, const Slice& value) { + out_.emplace_back(std::string(key.as_string_view()), + std::string(value.as_string_view())); + } + + template + void Encode(Which, const typename Which::ValueType& value) { + auto value_slice = Which::Encode(value); + out_.emplace_back(std::string(Which::key()), + std::string(value_slice.as_string_view())); + } + + void Encode(GrpcTimeoutMetadata, + const typename GrpcTimeoutMetadata::ValueType&) {} + void Encode(HttpPathMetadata, const Slice&) {} + void Encode(HttpMethodMetadata, + const typename HttpMethodMetadata::ValueType&) {} + + std::vector> Take() { + return std::move(out_); + } + + private: + std::vector> out_; +}; + +} // namespace + +absl::optional LbMetadata::Lookup( + absl::string_view key, std::string* buffer) const { + if (batch_ == nullptr) return absl::nullopt; + return batch_->GetStringValue(key, buffer); +} + +std::vector> +LbMetadata::TestOnlyCopyToVector() const { + if (batch_ == nullptr) return {}; + Encoder encoder; + batch_->Encode(&encoder); + return encoder.Take(); +} + +// +// MetadataMutationHandler +// + +void MetadataMutationHandler::Apply( + LoadBalancingPolicy::MetadataMutations& metadata_mutations, + grpc_metadata_batch* metadata) { + for (auto& p : metadata_mutations.metadata_) { + absl::string_view key = p.first; + Slice& value = + grpc_event_engine::experimental::internal::SliceCast(p.second); + // TODO(roth): Should we prevent this from setting special keys like + // :authority, :path, content-type, etc? + metadata->Remove(key); + // Gross, egregious hack to support legacy grpclb behavior. + // TODO(ctiller): Use a promise context for this once that plumbing is done. + if (key == GrpcLbClientStatsMetadata::key()) { + metadata->Set( + GrpcLbClientStatsMetadata(), + const_cast( + reinterpret_cast(value.data()))); + continue; + } + metadata->Append(key, std::move(value), + [key](absl::string_view error, const Slice& value) { + LOG(ERROR) << error << " key:" << key + << " value:" << value.as_string_view(); + }); + } +} + +// +// MaybeOverrideAuthority() +// + +void MaybeOverrideAuthority( + grpc_event_engine::experimental::Slice authority_override, + grpc_metadata_batch* metadata) { + // Skip if no override requested. + if (authority_override.empty()) return; + // Skip if authority already set by the application on this RPC. + if (metadata->get_pointer(HttpAuthorityMetadata()) != nullptr) return; + // Otherwise, apply override. + Slice& authority = + grpc_event_engine::experimental::internal::SliceCast( + authority_override); + metadata->Set(HttpAuthorityMetadata(), std::move(authority)); +} + +} // namespace grpc_core diff --git a/src/core/client_channel/lb_metadata.h b/src/core/client_channel/lb_metadata.h new file mode 100644 index 0000000000..f1c5e7e429 --- /dev/null +++ b/src/core/client_channel/lb_metadata.h @@ -0,0 +1,56 @@ +// Copyright 2024 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_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H +#define GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H + +#include +#include + +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" + +#include + +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/load_balancing/lb_policy.h" + +namespace grpc_core { + +class LbMetadata : public LoadBalancingPolicy::MetadataInterface { + public: + explicit LbMetadata(grpc_metadata_batch* batch) : batch_(batch) {} + + absl::optional Lookup(absl::string_view key, + std::string* buffer) const override; + + std::vector> TestOnlyCopyToVector() const; + + private: + grpc_metadata_batch* batch_; +}; + +class MetadataMutationHandler { + public: + static void Apply(LoadBalancingPolicy::MetadataMutations& metadata_mutations, + grpc_metadata_batch* metadata); +}; + +void MaybeOverrideAuthority( + grpc_event_engine::experimental::Slice authority_override, + grpc_metadata_batch* metadata); + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H diff --git a/src/core/client_channel/load_balanced_call_destination.cc b/src/core/client_channel/load_balanced_call_destination.cc index 51c9328919..a54a249616 100644 --- a/src/core/client_channel/load_balanced_call_destination.cc +++ b/src/core/client_channel/load_balanced_call_destination.cc @@ -14,8 +14,11 @@ #include "src/core/client_channel/load_balanced_call_destination.h" +#include "absl/log/log.h" + #include "src/core/client_channel/client_channel.h" #include "src/core/client_channel/client_channel_internal.h" +#include "src/core/client_channel/lb_metadata.h" #include "src/core/client_channel/subchannel.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/config/core_configuration.h" @@ -26,76 +29,6 @@ namespace grpc_core { namespace { -class LbMetadata : public LoadBalancingPolicy::MetadataInterface { - public: - explicit LbMetadata(grpc_metadata_batch* batch) : batch_(batch) {} - - void Add(absl::string_view key, absl::string_view value) override { - if (batch_ == nullptr) return; - // Gross, egregious hack to support legacy grpclb behavior. - // TODO(ctiller): Use a promise context for this once that plumbing is done. - if (key == GrpcLbClientStatsMetadata::key()) { - batch_->Set( - GrpcLbClientStatsMetadata(), - const_cast( - reinterpret_cast(value.data()))); - return; - } - batch_->Append(key, Slice::FromStaticString(value), - [key](absl::string_view error, const Slice& value) { - gpr_log(GPR_ERROR, "%s", - absl::StrCat(error, " key:", key, - " value:", value.as_string_view()) - .c_str()); - }); - } - - std::vector> TestOnlyCopyToVector() - override { - if (batch_ == nullptr) return {}; - Encoder encoder; - batch_->Encode(&encoder); - return encoder.Take(); - } - - absl::optional Lookup(absl::string_view key, - std::string* buffer) const override { - if (batch_ == nullptr) return absl::nullopt; - return batch_->GetStringValue(key, buffer); - } - - private: - class Encoder { - public: - void Encode(const Slice& key, const Slice& value) { - out_.emplace_back(std::string(key.as_string_view()), - std::string(value.as_string_view())); - } - - template - void Encode(Which, const typename Which::ValueType& value) { - auto value_slice = Which::Encode(value); - out_.emplace_back(std::string(Which::key()), - std::string(value_slice.as_string_view())); - } - - void Encode(GrpcTimeoutMetadata, - const typename GrpcTimeoutMetadata::ValueType&) {} - void Encode(HttpPathMetadata, const Slice&) {} - void Encode(HttpMethodMetadata, - const typename HttpMethodMetadata::ValueType&) {} - - std::vector> Take() { - return std::move(out_); - } - - private: - std::vector> out_; - }; - - grpc_metadata_batch* batch_; -}; - void MaybeCreateCallAttemptTracer(bool is_transparent_retry) { auto* call_tracer = MaybeGetContext(); if (call_tracer == nullptr) return; @@ -208,6 +141,11 @@ LoopCtl>> PickSubchannel( complete_pick->subchannel_call_tracker->Start(); SetContext(complete_pick->subchannel_call_tracker.release()); } + // Apply metadata mutations, if any. + MetadataMutationHandler::Apply(complete_pick->metadata_mutations, + &client_initial_metadata); + MaybeOverrideAuthority(std::move(complete_pick->authority_override), + &client_initial_metadata); // Return the connected subchannel. return call_destination; }, diff --git a/src/core/client_channel/retry_filter.cc b/src/core/client_channel/retry_filter.cc index f09d06d0e2..754a543d7e 100644 --- a/src/core/client_channel/retry_filter.cc +++ b/src/core/client_channel/retry_filter.cc @@ -147,7 +147,7 @@ const grpc_channel_filter RetryFilter::kVtable = { grpc_channel_stack_no_post_init, RetryFilter::Destroy, RetryFilter::GetChannelInfo, - "retry_filter", + GRPC_UNIQUE_TYPE_NAME_HERE("retry_filter"), }; } // namespace grpc_core diff --git a/src/core/client_channel/retry_filter_legacy_call_data.cc b/src/core/client_channel/retry_filter_legacy_call_data.cc index 563795a365..303b40a304 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.cc +++ b/src/core/client_channel/retry_filter_legacy_call_data.cc @@ -22,11 +22,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include - #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/retry_service_config.h" #include "src/core/client_channel/retry_throttle.h" @@ -141,9 +140,9 @@ RetryFilter::LegacyCallData::CallAttempt::CallAttempt( }, is_transparent_retry); if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: created attempt, lb_call=%p", - calld->chand_, calld, this, lb_call_.get()); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << this + << ": created attempt, lb_call=" << lb_call_.get(); } // If per_attempt_recv_timeout is set, start a timer. if (calld->retry_policy_ != nullptr && @@ -151,10 +150,9 @@ RetryFilter::LegacyCallData::CallAttempt::CallAttempt( const Duration per_attempt_recv_timeout = *calld->retry_policy_->per_attempt_recv_timeout(); if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: per-attempt timeout in %" PRId64 - " ms", - calld->chand_, calld, this, per_attempt_recv_timeout.millis()); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << this << ": per-attempt timeout in " + << per_attempt_recv_timeout.millis() << " ms"; } // Schedule retry after computed delay. GRPC_CALL_STACK_REF(calld->owning_call_, "OnPerAttemptRecvTimer"); @@ -170,8 +168,8 @@ RetryFilter::LegacyCallData::CallAttempt::CallAttempt( RetryFilter::LegacyCallData::CallAttempt::~CallAttempt() { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: destroying call attempt", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": destroying call attempt"; } } @@ -237,10 +235,10 @@ void RetryFilter::LegacyCallData::CallAttempt::MaybeSwitchToFastPath() { if (recv_trailing_metadata_internal_batch_ != nullptr) return; // Switch to fast path. if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: retry state no longer needed; " - "moving LB call to parent and unreffing the call attempt", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": retry state no longer needed; " + "moving LB call to parent and unreffing the call attempt"; } calld_->committed_call_ = std::move(lb_call_); calld_->call_attempt_.reset(DEBUG_LOCATION, "MaybeSwitchToFastPath"); @@ -256,10 +254,10 @@ RetryFilter::LegacyCallData::CallAttempt::MaybeCreateBatchForReplay() { if (calld_->seen_send_initial_metadata_ && !started_send_initial_metadata_ && !calld_->pending_send_initial_metadata_) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: replaying previously completed " - "send_initial_metadata op", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": replaying previously completed " + "send_initial_metadata op"; } replay_batch_data = CreateBatch(1, true /* set_on_complete */); replay_batch_data->AddRetriableSendInitialMetadataOp(); @@ -270,10 +268,10 @@ RetryFilter::LegacyCallData::CallAttempt::MaybeCreateBatchForReplay() { started_send_message_count_ == completed_send_message_count_ && !calld_->pending_send_message_) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: replaying previously completed " - "send_message op", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": replaying previously completed " + "send_message op"; } if (replay_batch_data == nullptr) { replay_batch_data = CreateBatch(1, true /* set_on_complete */); @@ -289,10 +287,10 @@ RetryFilter::LegacyCallData::CallAttempt::MaybeCreateBatchForReplay() { !started_send_trailing_metadata_ && !calld_->pending_send_trailing_metadata_) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: replaying previously completed " - "send_trailing_metadata op", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": replaying previously completed " + "send_trailing_metadata op"; } if (replay_batch_data == nullptr) { replay_batch_data = CreateBatch(1, true /* set_on_complete */); @@ -320,9 +318,9 @@ void RetryFilter::LegacyCallData::CallAttempt::AddClosureForBatch( grpc_transport_stream_op_batch* batch, const char* reason, CallCombinerClosureList* closures) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: adding batch (%s): %s", - calld_->chand_, calld_, this, reason, - grpc_transport_stream_op_batch_string(batch, false).c_str()); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": adding batch (" << reason + << "): " << grpc_transport_stream_op_batch_string(batch, false); } batch->handler_private.extra_arg = lb_call_.get(); GRPC_CLOSURE_INIT(&batch->handler_private.closure, StartBatchInCallCombiner, @@ -333,10 +331,10 @@ void RetryFilter::LegacyCallData::CallAttempt::AddClosureForBatch( void RetryFilter::LegacyCallData::CallAttempt:: AddBatchForInternalRecvTrailingMetadata(CallCombinerClosureList* closures) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: call failed but " - "recv_trailing_metadata not started; starting it internally", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": call failed but recv_trailing_metadata not started; " + "starting it internally"; } // Create batch_data with 2 refs, since this batch will be unreffed twice: // once for the recv_trailing_metadata_ready callback when the batch @@ -523,9 +521,8 @@ void RetryFilter::LegacyCallData::CallAttempt::AddRetriableBatches( void RetryFilter::LegacyCallData::CallAttempt::StartRetriableBatches() { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: constructing retriable batches", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": constructing retriable batches"; } // Construct list of closures to execute, one for each pending batch. CallCombinerClosureList closures; @@ -533,10 +530,9 @@ void RetryFilter::LegacyCallData::CallAttempt::StartRetriableBatches() { // Note: This will yield the call combiner. // Start batches on LB call. if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: starting %" PRIuPTR - " retriable batches on lb_call=%p", - calld_->chand_, calld_, this, closures.size(), lb_call_.get()); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": starting " << closures.size() + << " retriable batches on lb_call=" << lb_call_.get(); } closures.RunClosures(calld_->call_combiner_); } @@ -561,19 +557,18 @@ bool RetryFilter::LegacyCallData::CallAttempt::ShouldRetry( calld_->retry_throttle_data_->RecordSuccess(); } if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: call succeeded", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": call succeeded"; } 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(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: status %s not configured as " - "retryable", - calld_->chand_, calld_, this, - grpc_status_code_to_string(*status)); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": status " + << grpc_status_code_to_string(*status) + << " not configured as retryable"; } return false; } @@ -588,17 +583,16 @@ bool RetryFilter::LegacyCallData::CallAttempt::ShouldRetry( if (calld_->retry_throttle_data_ != nullptr && !calld_->retry_throttle_data_->RecordFailure()) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: retries throttled", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": retries throttled"; } return false; } // Check whether the call is committed. if (calld_->retry_committed_) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: retries already committed", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": retries already committed"; } return false; } @@ -607,9 +601,9 @@ bool RetryFilter::LegacyCallData::CallAttempt::ShouldRetry( if (calld_->num_attempts_completed_ >= calld_->retry_policy_->max_attempts()) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log( - GPR_INFO, "chand=%p calld=%p attempt=%p: exceeded %d retry attempts", - calld_->chand_, calld_, this, calld_->retry_policy_->max_attempts()); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": exceeded " + << calld_->retry_policy_->max_attempts() << " retry attempts"; } return false; } @@ -617,19 +611,16 @@ bool RetryFilter::LegacyCallData::CallAttempt::ShouldRetry( if (server_pushback.has_value()) { if (*server_pushback < Duration::Zero()) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: not retrying due to server " - "push-back", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": not retrying due to server push-back"; } return false; } else { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log( - GPR_INFO, - "chand=%p calld=%p attempt=%p: server push-back: retry in %" PRIu64 - " ms", - calld_->chand_, calld_, this, server_pushback->millis()); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this << ": server push-back: retry in " + << server_pushback->millis() << " ms"; } } } @@ -675,11 +666,12 @@ void RetryFilter::LegacyCallData::CallAttempt::OnPerAttemptRecvTimerLocked( auto* call_attempt = static_cast(arg); auto* calld = call_attempt->calld_; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: perAttemptRecvTimeout timer fired: " - "error=%s, per_attempt_recv_timer_handle_.has_value()=%d", - calld->chand_, calld, call_attempt, StatusToString(error).c_str(), - call_attempt->per_attempt_recv_timer_handle_.has_value()); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << ": perAttemptRecvTimeout timer fired: error=" + << StatusToString(error) + << ", per_attempt_recv_timer_handle_.has_value()=" + << call_attempt->per_attempt_recv_timer_handle_.has_value(); } CallCombinerClosureList closures; call_attempt->per_attempt_recv_timer_handle_.reset(); @@ -714,10 +706,9 @@ void RetryFilter::LegacyCallData::CallAttempt:: MaybeCancelPerAttemptRecvTimer() { if (per_attempt_recv_timer_handle_.has_value()) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: cancelling " - "perAttemptRecvTimeout timer", - calld_->chand_, calld_, this); + LOG(INFO) << "chand=" << calld_->chand_ << " calld=" << calld_ + << " attempt=" << this + << ": cancelling perAttemptRecvTimeout timer"; } if (calld_->chand_->event_engine()->Cancel( *per_attempt_recv_timer_handle_)) { @@ -738,9 +729,9 @@ RetryFilter::LegacyCallData::CallAttempt::BatchData::BatchData( refcount), call_attempt_(attempt.release()) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: creating batch %p", - call_attempt_->calld_->chand_, call_attempt_->calld_, call_attempt_, - this); + LOG(INFO) << "chand=" << call_attempt_->calld_->chand_ + << " calld=" << call_attempt_->calld_ + << " attempt=" << call_attempt_ << ": creating batch " << this; } // We hold a ref to the call stack for every batch sent on a call attempt. // This is because some batches on the call attempt may not complete @@ -759,9 +750,9 @@ RetryFilter::LegacyCallData::CallAttempt::BatchData::BatchData( RetryFilter::LegacyCallData::CallAttempt::BatchData::~BatchData() { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: destroying batch %p", - call_attempt_->calld_->chand_, call_attempt_->calld_, call_attempt_, - this); + LOG(INFO) << "chand=" << call_attempt_->calld_->chand_ + << " calld=" << call_attempt_->calld_ + << " attempt=" << call_attempt_ << ": destroying batch " << this; } CallAttempt* call_attempt = std::exchange(call_attempt_, nullptr); grpc_call_stack* owning_call = call_attempt->calld_->owning_call_; @@ -832,11 +823,11 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got recv_initial_metadata_ready, error=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str()); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << " batch_data=" << batch_data.get() + << ": got recv_initial_metadata_ready, error=" + << StatusToString(error); } call_attempt->completed_recv_initial_metadata_ = true; // If this attempt has been abandoned, then we're not going to use the @@ -859,10 +850,9 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: (call_attempt->trailing_metadata_available_ || !error.ok()) && !call_attempt->completed_recv_trailing_metadata_)) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: deferring " - "recv_initial_metadata_ready (Trailers-Only)", - calld->chand_, calld, call_attempt); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << ": deferring recv_initial_metadata_ready (Trailers-Only)"; } call_attempt->recv_initial_metadata_ready_deferred_batch_ = std::move(batch_data); @@ -931,11 +921,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::RecvMessageReady( CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got recv_message_ready, error=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str()); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << " batch_data=" << batch_data.get() + << ": got recv_message_ready, error=" << StatusToString(error); } ++call_attempt->completed_recv_message_count_; // If this attempt has been abandoned, then we're not going to use the @@ -961,10 +950,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::RecvMessageReady( (!call_attempt->recv_message_.has_value() || !error.ok()) && !call_attempt->completed_recv_trailing_metadata_)) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: deferring recv_message_ready " - "(nullptr message and recv_trailing_metadata pending)", - calld->chand_, calld, call_attempt); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << ": deferring recv_message_ready (nullptr message and " + "recv_trailing_metadata pending)"; } call_attempt->recv_message_ready_deferred_batch_ = std::move(batch_data); call_attempt->recv_message_error_ = error; @@ -1125,11 +1114,11 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got recv_trailing_metadata_ready, error=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str()); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << " batch_data=" << batch_data.get() + << ": got recv_trailing_metadata_ready, error=" + << StatusToString(error); } call_attempt->completed_recv_trailing_metadata_ = true; // If this attempt has been abandoned, then we're not going to use the @@ -1152,17 +1141,15 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: GetCallStatus(calld->deadline_, md_batch, error, &status, &server_pushback, &is_lb_drop, &stream_network_state); if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: call finished, status=%s " - "server_pushback=%s is_lb_drop=%d stream_network_state=%s", - calld->chand_, calld, call_attempt, - grpc_status_code_to_string(status), - server_pushback.has_value() ? server_pushback->ToString().c_str() - : "N/A", - is_lb_drop, - stream_network_state.has_value() - ? absl::StrCat(*stream_network_state).c_str() - : "N/A"); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt << ": call finished, status=" + << grpc_status_code_to_string(status) << " server_pushback=" + << (server_pushback.has_value() ? server_pushback->ToString() + : "N/A") + << " is_lb_drop=" << is_lb_drop << " stream_network_state=" + << (stream_network_state.has_value() + ? absl::StrCat(*stream_network_state) + : "N/A"); } // Check if we should retry. if (!is_lb_drop) { // Never retry on LB drops. @@ -1273,10 +1260,9 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: } if (have_pending_send_ops) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p: starting next batch for pending " - "send op(s)", - calld->chand_, calld, call_attempt_); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt_ + << ": starting next batch for pending send op(s)"; } call_attempt_->AddRetriableBatches(closures); } @@ -1288,13 +1274,13 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::OnComplete( CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got on_complete, error=%s, batch=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str(), - grpc_transport_stream_op_batch_string(&batch_data->batch_, false) - .c_str()); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << " batch_data=" << batch_data.get() + << ": got on_complete, error=" << StatusToString(error) + << ", batch=" + << grpc_transport_stream_op_batch_string(&batch_data->batch_, + false); } // If this attempt has been abandoned, then we're not going to propagate // the completion of this batch, so do nothing. @@ -1310,8 +1296,8 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::OnComplete( if (GPR_UNLIKELY(!calld->retry_committed_ && !error.ok() && !call_attempt->completed_recv_trailing_metadata_)) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p attempt=%p: deferring on_complete", - calld->chand_, calld, call_attempt); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt << ": deferring on_complete"; } call_attempt->on_complete_deferred_batches_.emplace_back( std::move(batch_data), error); @@ -1364,19 +1350,18 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::OnCompleteForCancelOp( CallAttempt* call_attempt = batch_data->call_attempt_; RetryFilter::LegacyCallData* calld = call_attempt->calld_; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p attempt=%p batch_data=%p: " - "got on_complete for cancel_stream batch, error=%s, batch=%s", - calld->chand_, calld, call_attempt, batch_data.get(), - StatusToString(error).c_str(), - grpc_transport_stream_op_batch_string(&batch_data->batch_, false) - .c_str()); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt + << " batch_data=" << batch_data.get() + << ": got on_complete for cancel_stream batch, error=" + << StatusToString(error) << ", batch=" + << grpc_transport_stream_op_batch_string(&batch_data->batch_, + false); } GRPC_CALL_COMBINER_STOP( calld->call_combiner_, "on_complete for internally generated cancel_stream op"); } - // // retriable batch construction // @@ -1408,12 +1393,10 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: AddRetriableSendMessageOp() { auto* calld = call_attempt_->calld_; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log( - GPR_INFO, - "chand=%p calld=%p attempt=%p: starting calld->send_messages[%" PRIuPTR - "]", - calld->chand_, calld, call_attempt_, - call_attempt_->started_send_message_count_); + LOG(INFO) << "chand=" << calld->chand_ << " calld=" << calld + << " attempt=" << call_attempt_ + << ": starting calld->send_messages[" + << call_attempt_->started_send_message_count_ << "]"; } CachedSendMessage cache = calld->send_messages_[call_attempt_->started_send_message_count_]; @@ -1497,8 +1480,8 @@ grpc_error_handle RetryFilter::LegacyCallData::Init( auto* chand = static_cast(elem->channel_data); new (elem->call_data) RetryFilter::LegacyCallData(chand, *args); if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: created call", chand, - elem->call_data); + LOG(INFO) << "chand=" << chand << " calld=" << elem->call_data + << ": created call"; } return absl::OkStatus(); } @@ -1579,9 +1562,9 @@ RetryFilter::LegacyCallData::~LegacyCallData() { void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( grpc_transport_stream_op_batch* batch) { if (GRPC_TRACE_FLAG_ENABLED(retry) && !GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: batch started from surface: %s", - chand_, this, - grpc_transport_stream_op_batch_string(batch, false).c_str()); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": batch started from surface: " + << grpc_transport_stream_op_batch_string(batch, false); } // If we have an LB call, delegate to the LB call. if (committed_call_ != nullptr) { @@ -1602,8 +1585,9 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( // Save cancel_error in case subsequent batches are started. cancelled_from_surface_ = batch->payload->cancel_stream.cancel_error; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: cancelled from surface: %s", chand_, - this, StatusToString(cancelled_from_surface_).c_str()); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": cancelled from surface: " + << StatusToString(cancelled_from_surface_); } // Fail any pending batches. PendingBatchesFail(cancelled_from_surface_); @@ -1625,8 +1609,8 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( // Cancel retry timer if needed. if (retry_timer_handle_.has_value()) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: cancelling retry timer", chand_, - this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": cancelling retry timer"; } if (chand_->event_engine()->Cancel(*retry_timer_handle_)) { GRPC_CALL_STACK_UNREF(owning_call_, "OnRetryTimer"); @@ -1671,10 +1655,9 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( (retry_policy_ == nullptr || !retry_policy_->per_attempt_recv_timeout().has_value())) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: retry committed before first attempt; " - "creating LB call", - chand_, this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": retry committed before first attempt; " + << "creating LB call"; } PendingBatchClear(pending); auto* service_config_call_data = @@ -1690,8 +1673,8 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( // The attempt will automatically start any necessary replays or // pending batches. if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: creating call attempt", chand_, - this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": creating call attempt"; } retry_codepath_started_ = true; CreateCallAttempt(/*is_transparent_retry=*/false); @@ -1699,8 +1682,8 @@ void RetryFilter::LegacyCallData::StartTransportStreamOpBatch( } // Send batches to call attempt. if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: starting batch on attempt=%p", chand_, - this, call_attempt_.get()); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": starting batch on attempt=" << call_attempt_.get(); } call_attempt_->StartRetriableBatches(); } @@ -1757,8 +1740,8 @@ void RetryFilter::LegacyCallData::MaybeCacheSendOpsForBatch( void RetryFilter::LegacyCallData::FreeCachedSendInitialMetadata() { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: destroying send_initial_metadata", - chand_, this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": destroying send_initial_metadata"; } send_initial_metadata_.Clear(); } @@ -1766,9 +1749,8 @@ void RetryFilter::LegacyCallData::FreeCachedSendInitialMetadata() { void RetryFilter::LegacyCallData::FreeCachedSendMessage(size_t idx) { if (send_messages_[idx].slices != nullptr) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: destroying send_messages[%" PRIuPTR "]", - chand_, this, idx); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": destroying send_messages[" << idx << "]"; } Destruct(std::exchange(send_messages_[idx].slices, nullptr)); } @@ -1776,8 +1758,8 @@ void RetryFilter::LegacyCallData::FreeCachedSendMessage(size_t idx) { void RetryFilter::LegacyCallData::FreeCachedSendTrailingMetadata() { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: destroying send_trailing_metadata", - chand_, this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": destroying send_trailing_metadata"; } send_trailing_metadata_.Clear(); } @@ -1815,9 +1797,8 @@ RetryFilter::LegacyCallData::PendingBatchesAdd( grpc_transport_stream_op_batch* batch) { const size_t idx = GetBatchIndex(batch); if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: adding pending batch at index %" PRIuPTR, - chand_, this, idx); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": adding pending batch at index " << idx; } PendingBatch* pending = &pending_batches_[idx]; CHECK_EQ(pending->batch, nullptr); @@ -1846,9 +1827,8 @@ RetryFilter::LegacyCallData::PendingBatchesAdd( if (GPR_UNLIKELY(bytes_buffered_for_retry_ > chand_->per_rpc_retry_buffer_size())) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: exceeded retry buffer size, committing", - chand_, this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": exceeded retry buffer size, committing"; } RetryCommit(call_attempt_.get()); } @@ -1883,8 +1863,8 @@ void RetryFilter::LegacyCallData::MaybeClearPendingBatch( batch->payload->recv_trailing_metadata.recv_trailing_metadata_ready == nullptr)) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: clearing pending batch", chand_, - this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": clearing pending batch"; } PendingBatchClear(pending); } @@ -1910,9 +1890,8 @@ void RetryFilter::LegacyCallData::PendingBatchesFail(grpc_error_handle error) { 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, StatusToString(error).c_str()); + LOG(INFO) << "chand=" << chand_ << " calld=" << this << ": failing " + << num_batches << " pending batches: " << StatusToString(error); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -1940,9 +1919,8 @@ RetryFilter::LegacyCallData::PendingBatchFind(const char* log_message, grpc_transport_stream_op_batch* batch = pending->batch; if (batch != nullptr && predicate(batch)) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: %s pending batch at index %" PRIuPTR, - chand_, this, log_message, i); + LOG(INFO) << "chand=" << chand_ << " calld=" << this << ": " + << log_message << " pending batch at index " << i; } return pending; } @@ -1958,7 +1936,8 @@ void RetryFilter::LegacyCallData::RetryCommit(CallAttempt* call_attempt) { if (retry_committed_) return; retry_committed_ = true; if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: committing retries", chand_, this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": committing retries"; } if (call_attempt != nullptr) { // If the call attempt's LB call has been committed, invoke the @@ -1992,9 +1971,9 @@ void RetryFilter::LegacyCallData::StartRetryTimer( next_attempt_timeout = retry_backoff_.NextAttemptTime() - Timestamp::Now(); } if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, - "chand=%p calld=%p: retrying failed call in %" PRId64 " ms", chand_, - this, next_attempt_timeout.millis()); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": retrying failed call in " << next_attempt_timeout.millis() + << " ms"; } // Schedule retry after computed delay. GRPC_CALL_STACK_REF(owning_call_, "OnRetryTimer"); @@ -2025,8 +2004,8 @@ void RetryFilter::LegacyCallData::OnRetryTimerLocked( void RetryFilter::LegacyCallData::AddClosureToStartTransparentRetry( CallCombinerClosureList* closures) { if (GRPC_TRACE_FLAG_ENABLED(retry)) { - gpr_log(GPR_INFO, "chand=%p calld=%p: scheduling transparent retry", chand_, - this); + LOG(INFO) << "chand=" << chand_ << " calld=" << this + << ": scheduling transparent retry"; } GRPC_CALL_STACK_REF(owning_call_, "OnRetryTimer"); GRPC_CLOSURE_INIT(&retry_closure_, StartTransparentRetry, this, nullptr); diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index 836ae9ee01..cee164a64a 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -37,7 +37,6 @@ #include #include #include -#include #include "src/core/channelz/channel_trace.h" #include "src/core/channelz/channelz.h" @@ -98,14 +97,11 @@ using ::grpc_event_engine::experimental::EventEngine; // ConnectedSubchannel // -ConnectedSubchannel::ConnectedSubchannel( - const ChannelArgs& args, - RefCountedPtr channelz_subchannel) +ConnectedSubchannel::ConnectedSubchannel(const ChannelArgs& args) : RefCounted( GRPC_TRACE_FLAG_ENABLED(subchannel_refcount) ? "ConnectedSubchannel" : nullptr), - args_(args), - channelz_subchannel_(std::move(channelz_subchannel)) {} + args_(args) {} // // LegacyConnectedSubchannel @@ -115,14 +111,19 @@ class LegacyConnectedSubchannel : public ConnectedSubchannel { public: LegacyConnectedSubchannel( RefCountedPtr channel_stack, const ChannelArgs& args, - RefCountedPtr channelz_subchannel) - : ConnectedSubchannel(args, std::move(channelz_subchannel)), + RefCountedPtr channelz_node) + : ConnectedSubchannel(args), + channelz_node_(std::move(channelz_node)), channel_stack_(std::move(channel_stack)) {} ~LegacyConnectedSubchannel() override { channel_stack_.reset(DEBUG_LOCATION, "ConnectedSubchannel"); } + channelz::SubchannelNode* channelz_node() const { + return channelz_node_.get(); + } + void StartWatch( grpc_pollset_set* interested_parties, OrphanablePtr watcher) override { @@ -163,6 +164,7 @@ class LegacyConnectedSubchannel : public ConnectedSubchannel { } private: + RefCountedPtr channelz_node_; RefCountedPtr channel_stack_; }; @@ -192,9 +194,8 @@ class NewConnectedSubchannel : public ConnectedSubchannel { NewConnectedSubchannel( RefCountedPtr call_destination, RefCountedPtr transport, - const ChannelArgs& args, - RefCountedPtr channelz_subchannel) - : ConnectedSubchannel(args, std::move(channelz_subchannel)), + const ChannelArgs& args) + : ConnectedSubchannel(args), call_destination_(std::move(call_destination)), transport_(std::move(transport)) {} @@ -241,7 +242,8 @@ RefCountedPtr SubchannelCall::Create(Args args, } SubchannelCall::SubchannelCall(Args args, grpc_error_handle* error) - : connected_subchannel_(std::move(args.connected_subchannel)), + : connected_subchannel_(args.connected_subchannel + .TakeAsSubclass()), deadline_(args.deadline) { grpc_call_stack* callstk = SUBCHANNEL_CALL_TO_CALL_STACK(this); const grpc_call_element_args call_args = { @@ -260,7 +262,7 @@ SubchannelCall::SubchannelCall(Args args, grpc_error_handle* error) return; } grpc_call_stack_set_pollset_or_pollset_set(callstk, args.pollent); - auto* channelz_node = connected_subchannel_->channelz_subchannel(); + auto* channelz_node = connected_subchannel_->channelz_node(); if (channelz_node != nullptr) { channelz_node->RecordCallStarted(); } @@ -271,7 +273,9 @@ void SubchannelCall::StartTransportStreamOpBatch( MaybeInterceptRecvTrailingMetadata(batch); grpc_call_stack* call_stack = SUBCHANNEL_CALL_TO_CALL_STACK(this); grpc_call_element* top_elem = grpc_call_stack_element(call_stack, 0); - GRPC_CALL_LOG_OP(GPR_INFO, top_elem, batch); + GRPC_TRACE_LOG(channel, INFO) + << "OP[" << top_elem->filter->name << ":" << top_elem + << "]: " << grpc_transport_stream_op_batch_string(batch, false); top_elem->filter->start_transport_stream_op_batch(top_elem, batch); } @@ -326,13 +330,9 @@ void SubchannelCall::Destroy(void* arg, grpc_error_handle /*error*/) { void SubchannelCall::MaybeInterceptRecvTrailingMetadata( grpc_transport_stream_op_batch* batch) { // only intercept payloads with recv trailing. - if (!batch->recv_trailing_metadata) { - return; - } + if (!batch->recv_trailing_metadata) return; // only add interceptor is channelz is enabled. - if (connected_subchannel_->channelz_subchannel() == nullptr) { - return; - } + if (connected_subchannel_->channelz_node() == nullptr) return; GRPC_CLOSURE_INIT(&recv_trailing_metadata_ready_, RecvTrailingMetadataReady, this, grpc_schedule_on_exec_ctx); // save some state needed for the interception callback. @@ -365,13 +365,13 @@ void SubchannelCall::RecvTrailingMetadataReady(void* arg, CHECK_NE(call->recv_trailing_metadata_, nullptr); grpc_status_code status = GRPC_STATUS_OK; GetCallStatus(&status, call->deadline_, call->recv_trailing_metadata_, error); - channelz::SubchannelNode* channelz_subchannel = - call->connected_subchannel_->channelz_subchannel(); - CHECK_NE(channelz_subchannel, nullptr); + channelz::SubchannelNode* channelz_node = + call->connected_subchannel_->channelz_node(); + CHECK_NE(channelz_node, nullptr); if (status == GRPC_STATUS_OK) { - channelz_subchannel->RecordCallSucceeded(); + channelz_node->RecordCallSucceeded(); } else { - channelz_subchannel->RecordCallFailed(); + channelz_node->RecordCallFailed(); } Closure::Run(DEBUG_LOCATION, call->original_recv_trailing_metadata_, error); } @@ -418,10 +418,10 @@ class Subchannel::ConnectedSubchannelStateWatcher final if (new_state == GRPC_CHANNEL_TRANSIENT_FAILURE || new_state == GRPC_CHANNEL_SHUTDOWN) { if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { - gpr_log(GPR_INFO, - "subchannel %p %s: Connected subchannel %p reports %s: %s", c, - c->key_.ToString().c_str(), c->connected_subchannel_.get(), - ConnectivityStateName(new_state), status.ToString().c_str()); + LOG(INFO) << "subchannel " << c << " " << c->key_.ToString() + << ": Connected subchannel " + << c->connected_subchannel_.get() << " reports " + << ConnectivityStateName(new_state) << ": " << status; } c->connected_subchannel_.reset(); if (c->channelz_node() != nullptr) { @@ -603,8 +603,8 @@ void Subchannel::ThrottleKeepaliveTime(int new_keepalive_time) { if (new_keepalive_time > keepalive_time_) { keepalive_time_ = new_keepalive_time; if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { - gpr_log(GPR_INFO, "subchannel %p %s: throttling keepalive time to %d", - this, key_.ToString().c_str(), new_keepalive_time); + LOG(INFO) << "subchannel " << this << " " << key_.ToString() + << ": throttling keepalive time to " << new_keepalive_time; } args_ = args_.Set(GRPC_ARG_KEEPALIVE_TIME_MS, new_keepalive_time); } @@ -758,8 +758,10 @@ void Subchannel::OnRetryTimer() { void Subchannel::OnRetryTimerLocked() { if (shutdown_) return; - gpr_log(GPR_INFO, "subchannel %p %s: backoff delay elapsed, reporting IDLE", - this, key_.ToString().c_str()); + if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { + LOG(INFO) << "subchannel " << this << " " << key_.ToString() + << ": backoff delay elapsed, reporting IDLE"; + } SetConnectivityStateLocked(GRPC_CHANNEL_IDLE, absl::OkStatus()); } @@ -803,11 +805,12 @@ void Subchannel::OnConnectingFinishedLocked(grpc_error_handle error) { if (connecting_result_.transport == nullptr || !PublishTransportLocked()) { const Duration time_until_next_attempt = next_attempt_time_ - Timestamp::Now(); - gpr_log(GPR_INFO, - "subchannel %p %s: connect failed (%s), backing off for %" PRId64 - " ms", - this, key_.ToString().c_str(), StatusToString(error).c_str(), - time_until_next_attempt.millis()); + if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { + LOG(INFO) << "subchannel " << this << " " << key_.ToString() + << ": connect failed (" << StatusToString(error) + << "), backing off for " << time_until_next_attempt.millis() + << " ms"; + } SetConnectivityStateLocked(GRPC_CHANNEL_TRANSIENT_FAILURE, grpc_error_to_absl_status(error)); retry_timer_handle_ = event_engine_->RunAfter( @@ -844,9 +847,8 @@ bool Subchannel::PublishTransportLocked() { absl::StatusOr> stack = builder.Build(); if (!stack.ok()) { connecting_result_.Reset(); - gpr_log(GPR_ERROR, - "subchannel %p %s: error initializing subchannel stack: %s", this, - key_.ToString().c_str(), stack.status().ToString().c_str()); + LOG(ERROR) << "subchannel " << this << " " << key_.ToString() + << ": error initializing subchannel stack: " << stack.status(); return false; } connected_subchannel_ = MakeRefCounted( @@ -857,6 +859,24 @@ bool Subchannel::PublishTransportLocked() { ->client_transport()); InterceptionChainBuilder builder( connecting_result_.channel_args.SetObject(transport.get())); + if (channelz_node_ != nullptr) { + // TODO(ctiller): If/when we have a good way to access the subchannel + // from a filter (maybe GetContext?), consider replacing + // these two hooks with a filter so that we can avoid storing two + // separate refs to the channelz node in each connection. + builder.AddOnClientInitialMetadata( + [channelz_node = channelz_node_](ClientMetadata&) { + channelz_node->RecordCallStarted(); + }); + builder.AddOnServerTrailingMetadata( + [channelz_node = channelz_node_](ServerMetadata& metadata) { + if (IsStatusOk(metadata)) { + channelz_node->RecordCallSucceeded(); + } else { + channelz_node->RecordCallFailed(); + } + }); + } CoreConfiguration::Get().channel_init().AddToInterceptionChainBuilder( GRPC_CLIENT_SUBCHANNEL, builder); auto transport_destination = @@ -865,21 +885,20 @@ bool Subchannel::PublishTransportLocked() { auto call_destination = builder.Build(transport_destination); if (!call_destination.ok()) { connecting_result_.Reset(); - gpr_log(GPR_ERROR, - "subchannel %p %s: error initializing subchannel stack: %s", this, - key_.ToString().c_str(), - call_destination.status().ToString().c_str()); + LOG(ERROR) << "subchannel " << this << " " << key_.ToString() + << ": error initializing subchannel stack: " + << call_destination.status(); return false; } connected_subchannel_ = MakeRefCounted( - std::move(*call_destination), std::move(transport_destination), args_, - channelz_node_); + std::move(*call_destination), std::move(transport_destination), args_); } connecting_result_.Reset(); // Publish. if (GRPC_TRACE_FLAG_ENABLED(subchannel)) { - gpr_log(GPR_INFO, "subchannel %p %s: new connected subchannel at %p", this, - key_.ToString().c_str(), connected_subchannel_.get()); + LOG(INFO) << "subchannel " << this << " " << key_.ToString() + << ": new connected subchannel at " + << connected_subchannel_.get(); } if (channelz_node_ != nullptr) { channelz_node_->SetChildSocket(std::move(socket_node)); diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h index 78c7895868..6ae44a5675 100644 --- a/src/core/client_channel/subchannel.h +++ b/src/core/client_channel/subchannel.h @@ -66,9 +66,6 @@ class SubchannelCall; class ConnectedSubchannel : public RefCounted { public: const ChannelArgs& args() const { return args_; } - channelz::SubchannelNode* channelz_subchannel() const { - return channelz_subchannel_.get(); - } virtual void StartWatch( grpc_pollset_set* interested_parties, @@ -85,17 +82,14 @@ class ConnectedSubchannel : public RefCounted { virtual void Ping(grpc_closure* on_initiate, grpc_closure* on_ack) = 0; protected: - ConnectedSubchannel( - const ChannelArgs& args, - RefCountedPtr channelz_subchannel); + explicit ConnectedSubchannel(const ChannelArgs& args); private: ChannelArgs args_; - // ref counted pointer to the channelz node in this connected subchannel's - // owning subchannel. - RefCountedPtr channelz_subchannel_; }; +class LegacyConnectedSubchannel; + // Implements the interface of RefCounted<>. class SubchannelCall final { public: @@ -150,7 +144,7 @@ class SubchannelCall final { static void Destroy(void* arg, grpc_error_handle error); - RefCountedPtr connected_subchannel_; + RefCountedPtr connected_subchannel_; grpc_closure* after_call_stack_destroy_ = nullptr; // State needed to support channelz interception of recv trailing metadata. grpc_closure recv_trailing_metadata_ready_; diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc index 082efb9716..24ac03bc38 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc @@ -24,13 +24,13 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/string_view.h" #include "upb/base/string_view.h" #include "upb/mem/arena.hpp" #include "xds/data/orca/v3/orca_load_report.upb.h" #include -#include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" @@ -117,8 +117,7 @@ absl::optional MaybeSerializeBackendMetrics( } // namespace const grpc_channel_filter BackendMetricFilter::kFilter = - MakePromiseBasedFilter( - "backend_metric"); + MakePromiseBasedFilter(); absl::StatusOr> BackendMetricFilter::Create(const ChannelArgs&, ChannelFilter::Args) { @@ -130,20 +129,20 @@ void BackendMetricFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) { auto* ctx = MaybeGetContext(); if (ctx == nullptr) { if (GRPC_TRACE_FLAG_ENABLED(backend_metric_filter)) { - gpr_log(GPR_INFO, "[%p] No BackendMetricProvider.", this); + LOG(INFO) << "[" << this << "] No BackendMetricProvider."; } return; } absl::optional serialized = MaybeSerializeBackendMetrics(ctx); if (serialized.has_value() && !serialized->empty()) { if (GRPC_TRACE_FLAG_ENABLED(backend_metric_filter)) { - gpr_log(GPR_INFO, "[%p] Backend metrics serialized. size: %" PRIuPTR, - this, serialized->size()); + LOG(INFO) << "[" << this + << "] Backend metrics serialized. size: " << serialized->size(); } md.Set(EndpointLoadMetricsBinMetadata(), Slice::FromCopiedString(std::move(*serialized))); } else if (GRPC_TRACE_FLAG_ENABLED(backend_metric_filter)) { - gpr_log(GPR_INFO, "[%p] No backend metrics.", this); + LOG(INFO) << "[" << this << "] No backend metrics."; } } diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.h b/src/core/ext/filters/backend_metrics/backend_metric_filter.h index 114fc3cc7b..02ee8611dc 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.h +++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.h @@ -35,6 +35,8 @@ class BackendMetricFilter : public ImplementChannelFilter { public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "backend_metric"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args); diff --git a/src/core/ext/filters/census/grpc_context.cc b/src/core/ext/filters/census/grpc_context.cc index e2affd09a4..77965df7ec 100644 --- a/src/core/ext/filters/census/grpc_context.cc +++ b/src/core/ext/filters/census/grpc_context.cc @@ -22,18 +22,18 @@ #include #include "src/core/lib/debug/trace.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/call.h" void grpc_census_call_set_context(grpc_call* call, census_context* context) { - GRPC_API_TRACE("grpc_census_call_set_context(call=%p, census_context=%p)", 2, - (call, context)); + GRPC_TRACE_LOG(api, INFO) << "grpc_census_call_set_context(call=" << call + << ", census_context=" << context << ")"; if (context != nullptr) { grpc_call_get_arena(call)->SetContext(context); } } census_context* grpc_census_call_get_context(grpc_call* call) { - GRPC_API_TRACE("grpc_census_call_get_context(call=%p)", 1, (call)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_census_call_get_context(call=" << call << ")"; return grpc_call_get_arena(call)->GetContext(); } diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc index c2e82de449..6d16ac68b7 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc @@ -51,6 +51,7 @@ #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/sleep.h" #include "src/core/lib/promise/try_seq.h" +#include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" @@ -70,13 +71,6 @@ const auto kMaxConnectionAgeJitter = 0.1; } // namespace -#define GRPC_IDLE_FILTER_LOG(format, ...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(client_idle_filter)) { \ - gpr_log(GPR_INFO, "(client idle filter) " format, ##__VA_ARGS__); \ - } \ - } while (0) - Duration GetClientIdleTimeout(const ChannelArgs& args) { return args.GetDurationFromIntMillis(GRPC_ARG_CLIENT_IDLE_TIMEOUT_MS) .value_or(kDefaultIdleTimeout); @@ -176,6 +170,9 @@ void LegacyMaxAgeFilter::PostInit() { // Start the max age timer if (max_connection_age_ != Duration::Infinity()) { + auto arena = SimpleArenaAllocator(0)->MakeArena(); + arena->SetContext( + channel_stack->EventEngine()); max_age_activity_.Set(MakeActivity( TrySeq( // First sleep until the max connection age @@ -213,7 +210,7 @@ void LegacyMaxAgeFilter::PostInit() { // (if it did not, it was cancelled) if (status.ok()) CloseChannel(); }, - channel_stack->EventEngine())); + std::move(arena))); } } @@ -255,7 +252,8 @@ void LegacyChannelIdleFilter::DecreaseCallCount() { } void LegacyChannelIdleFilter::StartIdleTimer() { - GRPC_IDLE_FILTER_LOG("timer has started"); + GRPC_TRACE_LOG(client_idle_filter, INFO) + << "(client idle filter) timer has started"; auto idle_filter_state = idle_filter_state_; // Hold a ref to the channel stack for the timer callback. auto channel_stack = channel_stack_->Ref(); @@ -270,12 +268,15 @@ void LegacyChannelIdleFilter::StartIdleTimer() { } }); }); + auto arena = SimpleArenaAllocator()->MakeArena(); + arena->SetContext( + channel_stack_->EventEngine()); activity_.Set(MakeActivity( std::move(promise), ExecCtxWakeupScheduler{}, [channel_stack, this](absl::Status status) { if (status.ok()) CloseChannel(); }, - channel_stack->EventEngine())); + std::move(arena))); } void LegacyChannelIdleFilter::CloseChannel() { @@ -289,11 +290,9 @@ void LegacyChannelIdleFilter::CloseChannel() { } const grpc_channel_filter LegacyClientIdleFilter::kFilter = - MakePromiseBasedFilter( - "client_idle"); + MakePromiseBasedFilter(); const grpc_channel_filter LegacyMaxAgeFilter::kFilter = - MakePromiseBasedFilter( - "max_age"); + MakePromiseBasedFilter(); void RegisterLegacyChannelIdleFilters(CoreConfiguration::Builder* builder) { builder->channel_init() diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h index 001282276f..9ee7981b2f 100644 --- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h +++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h @@ -96,6 +96,8 @@ class LegacyClientIdleFilter final : public LegacyChannelIdleFilter { public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "client_idle"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); @@ -107,6 +109,8 @@ class LegacyMaxAgeFilter final : public LegacyChannelIdleFilter { static const grpc_channel_filter kFilter; struct Config; + static absl::string_view TypeName() { return "max_age"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc index 6190ad4008..b4bf623bbb 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -27,6 +27,7 @@ #include #include +#include "absl/log/log.h" #include "absl/meta/type_traits.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -36,7 +37,6 @@ #include "absl/types/optional.h" #include -#include #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/lib/channel/channel_stack.h" @@ -151,8 +151,8 @@ ArenaPromise FaultInjectionFilter::Call::OnClientInitialMetadata( ClientMetadata& md, FaultInjectionFilter* filter) { auto decision = filter->MakeInjectionDecision(md); if (GRPC_TRACE_FLAG_ENABLED(fault_injection_filter)) { - gpr_log(GPR_INFO, "chand=%p: Fault injection triggered %s", this, - decision.ToString().c_str()); + LOG(INFO) << "chand=" << this << ": Fault injection triggered " + << decision.ToString(); } auto delay = decision.DelayUntil(); return TrySeq(Sleep(delay), [decision = std::move(decision)]() { @@ -270,8 +270,7 @@ std::string FaultInjectionFilter::InjectionDecision::ToString() const { } const grpc_channel_filter FaultInjectionFilter::kFilter = - MakePromiseBasedFilter( - "fault_injection_filter"); + MakePromiseBasedFilter(); void FaultInjectionFilterRegister(CoreConfiguration::Builder* builder) { FaultInjectionServiceConfigParser::Register(builder); diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.h b/src/core/ext/filters/fault_injection/fault_injection_filter.h index 515df16a85..7bcd222706 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.h +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h @@ -45,6 +45,8 @@ class FaultInjectionFilter public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "fault_injection_filter"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index 6af2b959be..7fd04a371e 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -59,7 +59,7 @@ const NoInterceptor HttpClientFilter::Call::OnFinalize; const grpc_channel_filter HttpClientFilter::kFilter = MakePromiseBasedFilter("http-client"); + kFilterExaminesServerInitialMetadata>(); namespace { absl::Status CheckServerMetadata(ServerMetadata* b) { diff --git a/src/core/ext/filters/http/client/http_client_filter.h b/src/core/ext/filters/http/client/http_client_filter.h index f985337f2c..0b319cec30 100644 --- a/src/core/ext/filters/http/client/http_client_filter.h +++ b/src/core/ext/filters/http/client/http_client_filter.h @@ -35,6 +35,8 @@ class HttpClientFilter : public ImplementChannelFilter { public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "http-client"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc index b6970d9ecb..6dd4423415 100644 --- a/src/core/ext/filters/http/client_authority_filter.cc +++ b/src/core/ext/filters/http/client_authority_filter.cc @@ -66,8 +66,7 @@ void ClientAuthorityFilter::Call::OnClientInitialMetadata( } const grpc_channel_filter ClientAuthorityFilter::kFilter = - MakePromiseBasedFilter( - "authority"); + MakePromiseBasedFilter(); namespace { bool NeedsClientAuthorityFilter(const ChannelArgs& args) { diff --git a/src/core/ext/filters/http/client_authority_filter.h b/src/core/ext/filters/http/client_authority_filter.h index da154fbac5..c3b817527c 100644 --- a/src/core/ext/filters/http/client_authority_filter.h +++ b/src/core/ext/filters/http/client_authority_filter.h @@ -39,6 +39,8 @@ class ClientAuthorityFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "authority"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args); diff --git a/src/core/ext/filters/http/message_compress/compression_filter.cc b/src/core/ext/filters/http/message_compress/compression_filter.cc index e3d0a61cd0..33491f1e6c 100644 --- a/src/core/ext/filters/http/message_compress/compression_filter.cc +++ b/src/core/ext/filters/http/message_compress/compression_filter.cc @@ -32,7 +32,6 @@ #include #include #include -#include #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" @@ -66,12 +65,12 @@ const grpc_channel_filter ClientCompressionFilter::kFilter = MakePromiseBasedFilter("compression"); + kFilterExaminesOutboundMessages>(); const grpc_channel_filter ServerCompressionFilter::kFilter = MakePromiseBasedFilter("compression"); + kFilterExaminesOutboundMessages>(); absl::StatusOr> ClientCompressionFilter::Create(const ChannelArgs& args, ChannelFilter::Args) { @@ -104,9 +103,8 @@ ChannelCompression::ChannelCompression(const ChannelArgs& args) &name)) { name = ""; } - gpr_log(GPR_ERROR, - "default compression algorithm %s not enabled: switching to none", - name); + LOG(ERROR) << "default compression algorithm " << name + << " not enabled: switching to none"; default_compression_algorithm_ = GRPC_COMPRESS_NONE; } } @@ -114,8 +112,8 @@ ChannelCompression::ChannelCompression(const ChannelArgs& args) MessageHandle ChannelCompression::CompressMessage( MessageHandle message, grpc_compression_algorithm algorithm) const { if (GRPC_TRACE_FLAG_ENABLED(compression)) { - gpr_log(GPR_INFO, "CompressMessage: len=%" PRIdPTR " alg=%d flags=%d", - message->payload()->Length(), algorithm, message->flags()); + LOG(INFO) << "CompressMessage: len=" << message->payload()->Length() + << " alg=" << algorithm << " flags=" << message->flags(); } auto* call_tracer = MaybeGetContext(); if (call_tracer != nullptr) { @@ -144,10 +142,10 @@ MessageHandle ChannelCompression::CompressMessage( const float savings_ratio = 1.0f - static_cast(after_size) / static_cast(before_size); CHECK(grpc_compression_algorithm_name(algorithm, &algo_name)); - gpr_log(GPR_INFO, - "Compressed[%s] %" PRIuPTR " bytes vs. %" PRIuPTR - " bytes (%.2f%% savings)", - algo_name, before_size, after_size, 100 * savings_ratio); + LOG(INFO) << absl::StrFormat( + "Compressed[%s] %" PRIuPTR " bytes vs. %" PRIuPTR + " bytes (%.2f%% savings)", + algo_name, before_size, after_size, 100 * savings_ratio); } tmp.Swap(payload); flags |= GRPC_WRITE_INTERNAL_COMPRESS; @@ -158,10 +156,9 @@ MessageHandle ChannelCompression::CompressMessage( if (GRPC_TRACE_FLAG_ENABLED(compression)) { const char* algo_name; CHECK(grpc_compression_algorithm_name(algorithm, &algo_name)); - gpr_log(GPR_INFO, - "Algorithm '%s' enabled but decided not to compress. Input size: " - "%" PRIuPTR, - algo_name, payload->Length()); + LOG(INFO) << "Algorithm '" << algo_name + << "' enabled but decided not to compress. Input size: " + << payload->Length(); } } return message; @@ -170,9 +167,9 @@ MessageHandle ChannelCompression::CompressMessage( absl::StatusOr ChannelCompression::DecompressMessage( bool is_client, MessageHandle message, DecompressArgs args) const { if (GRPC_TRACE_FLAG_ENABLED(compression)) { - gpr_log(GPR_INFO, "DecompressMessage: len=%" PRIdPTR " max=%d alg=%d", - message->payload()->Length(), - args.max_recv_message_length.value_or(-1), args.algorithm); + LOG(INFO) << "DecompressMessage: len=" << message->payload()->Length() + << " max=" << args.max_recv_message_length.value_or(-1) + << " alg=" << args.algorithm; } auto* call_tracer = MaybeGetContext(); if (call_tracer != nullptr) { diff --git a/src/core/ext/filters/http/message_compress/compression_filter.h b/src/core/ext/filters/http/message_compress/compression_filter.h index 5d82846d01..ae3a9ee317 100644 --- a/src/core/ext/filters/http/message_compress/compression_filter.h +++ b/src/core/ext/filters/http/message_compress/compression_filter.h @@ -25,6 +25,7 @@ #include #include "absl/status/statusor.h" +#include "absl/strings/string_view.h" #include "absl/types/optional.h" #include @@ -110,6 +111,8 @@ class ClientCompressionFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "compression"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); @@ -147,6 +150,8 @@ class ServerCompressionFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "compression"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index 8d4b71d510..5cfe96f717 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -25,12 +25,12 @@ #include #include "absl/base/attributes.h" +#include "absl/log/log.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include #include -#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" @@ -55,7 +55,7 @@ const NoInterceptor HttpServerFilter::Call::OnFinalize; const grpc_channel_filter HttpServerFilter::kFilter = MakePromiseBasedFilter("http-server"); + kFilterExaminesServerInitialMetadata>(); namespace { void FilterOutgoingMetadata(ServerMetadata* md) { @@ -140,8 +140,8 @@ ServerMetadataHandle HttpServerFilter::Call::OnClientInitialMetadata( void HttpServerFilter::Call::OnServerInitialMetadata(ServerMetadata& md) { if (GRPC_TRACE_FLAG_ENABLED(call)) { - gpr_log(GPR_INFO, "%s[http-server] Write metadata", - GetContext()->DebugTag().c_str()); + LOG(INFO) << GetContext()->DebugTag() + << "[http-server] Write metadata"; } FilterOutgoingMetadata(&md); md.Set(HttpStatusMetadata(), 200); diff --git a/src/core/ext/filters/http/server/http_server_filter.h b/src/core/ext/filters/http/server/http_server_filter.h index a1f330e58b..8f933865d7 100644 --- a/src/core/ext/filters/http/server/http_server_filter.h +++ b/src/core/ext/filters/http/server/http_server_filter.h @@ -36,6 +36,8 @@ class HttpServerFilter : public ImplementChannelFilter { public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "http-server"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index 3a8a3659a4..c00d7d8fed 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -23,11 +23,11 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include #include -#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" @@ -137,12 +137,12 @@ size_t MessageSizeParser::ParserIndex() { const grpc_channel_filter ClientMessageSizeFilter::kFilter = MakePromiseBasedFilter("message_size"); + kFilterExaminesInboundMessages>(); const grpc_channel_filter ServerMessageSizeFilter::kFilter = MakePromiseBasedFilter("message_size"); + kFilterExaminesInboundMessages>(); absl::StatusOr> ClientMessageSizeFilter::Create(const ChannelArgs& args, ChannelFilter::Args) { @@ -160,19 +160,17 @@ ServerMetadataHandle CheckPayload(const Message& msg, bool is_client, bool is_send) { if (!max_length.has_value()) return nullptr; if (GRPC_TRACE_FLAG_ENABLED(call)) { - gpr_log(GPR_INFO, "%s[message_size] %s len:%" PRIdPTR " max:%d", - GetContext()->DebugTag().c_str(), - is_send ? "send" : "recv", msg.payload()->Length(), *max_length); + LOG(INFO) << GetContext()->DebugTag() << "[message_size] " + << (is_send ? "send" : "recv") + << " len:" << msg.payload()->Length() << " max:" << *max_length; } if (msg.payload()->Length() <= *max_length) return nullptr; - auto r = Arena::MakePooled(); - r->Set(GrpcStatusMetadata(), GRPC_STATUS_RESOURCE_EXHAUSTED); - r->Set(GrpcMessageMetadata(), - Slice::FromCopiedString(absl::StrFormat( - "%s: %s message larger than max (%u vs. %d)", - is_client ? "CLIENT" : "SERVER", is_send ? "Sent" : "Received", - msg.payload()->Length(), *max_length))); - return r; + return ServerMetadataFromStatus( + GRPC_STATUS_RESOURCE_EXHAUSTED, + absl::StrFormat("%s: %s message larger than max (%u vs. %d)", + is_client ? "CLIENT" : "SERVER", + is_send ? "Sent" : "Received", msg.payload()->Length(), + *max_length)); } } // namespace diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h index 970604fe35..3ed3b2b735 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -89,6 +89,8 @@ class ServerMessageSizeFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "message_size"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); @@ -117,6 +119,8 @@ class ClientMessageSizeFilter final public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "message_size"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc index a86636b10a..583042786f 100644 --- a/src/core/ext/filters/rbac/rbac_filter.cc +++ b/src/core/ext/filters/rbac/rbac_filter.cc @@ -71,7 +71,7 @@ absl::Status RbacFilter::Call::OnClientInitialMetadata(ClientMetadata& md, } const grpc_channel_filter RbacFilter::kFilterVtable = - MakePromiseBasedFilter("rbac_filter"); + MakePromiseBasedFilter(); RbacFilter::RbacFilter(size_t index, EvaluateArgs::PerChannelArgs per_channel_evaluate_args) diff --git a/src/core/ext/filters/rbac/rbac_filter.h b/src/core/ext/filters/rbac/rbac_filter.h index d033b799d5..f41e8490cc 100644 --- a/src/core/ext/filters/rbac/rbac_filter.h +++ b/src/core/ext/filters/rbac/rbac_filter.h @@ -42,6 +42,8 @@ class RbacFilter : public ImplementChannelFilter { // and enforces the RBAC policy. static const grpc_channel_filter kFilterVtable; + static absl::string_view TypeName() { return "rbac_filter"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc index 246605a490..c677bd2cc1 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -69,8 +69,7 @@ UniqueTypeName XdsOverrideHostAttribute::TypeName() { const grpc_channel_filter StatefulSessionFilter::kFilter = MakePromiseBasedFilter( - "stateful_session_filter"); + kFilterExaminesServerInitialMetadata>(); absl::StatusOr> StatefulSessionFilter::Create(const ChannelArgs&, diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h index 64c488bce3..3bffbaa854 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.h +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h @@ -74,6 +74,8 @@ class StatefulSessionFilter public: static const grpc_channel_filter kFilter; + static absl::string_view TypeName() { return "stateful_session_filter"; } + static absl::StatusOr> Create( const ChannelArgs& args, ChannelFilter::Args filter_args); diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 8711eece3b..48204fd2c6 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -66,7 +65,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/insecure/insecure_credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" @@ -120,10 +118,12 @@ void Chttp2Connector::Connect(const Args& args, Result* result, CoreConfiguration::Get().handshaker_registry().AddHandshakers( HANDSHAKER_CLIENT, channel_args, args_.interested_parties, handshake_mgr_.get()); - Ref().release(); // Ref held by OnHandshakeDone(). - handshake_mgr_->DoHandshake(nullptr /* endpoint */, channel_args, - args.deadline, nullptr /* acceptor */, - OnHandshakeDone, this); + handshake_mgr_->DoHandshake( + /*endpoint=*/nullptr, channel_args, args.deadline, /*acceptor=*/nullptr, + [self = RefAsSubclass()]( + absl::StatusOr result) { + self->OnHandshakeDone(std::move(result)); + }); } void Chttp2Connector::Shutdown(grpc_error_handle error) { @@ -135,54 +135,44 @@ void Chttp2Connector::Shutdown(grpc_error_handle error) { } } -void Chttp2Connector::OnHandshakeDone(void* arg, grpc_error_handle error) { - auto* args = static_cast(arg); - Chttp2Connector* self = static_cast(args->user_data); - { - MutexLock lock(&self->mu_); - if (!error.ok() || self->shutdown_) { - if (error.ok()) { - error = GRPC_ERROR_CREATE("connector shutdown"); - // We were shut down after handshaking completed successfully, so - // destroy the endpoint here. - if (args->endpoint != nullptr) { - grpc_endpoint_destroy(args->endpoint); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); - } - } - self->result_->Reset(); - NullThenSchedClosure(DEBUG_LOCATION, &self->notify_, error); - } else if (args->endpoint != nullptr) { - self->result_->transport = - grpc_create_chttp2_transport(args->args, args->endpoint, true); - CHECK_NE(self->result_->transport, nullptr); - self->result_->socket_node = - grpc_chttp2_transport_get_socket_node(self->result_->transport); - self->result_->channel_args = args->args; - self->Ref().release(); // Ref held by OnReceiveSettings() - GRPC_CLOSURE_INIT(&self->on_receive_settings_, OnReceiveSettings, self, - grpc_schedule_on_exec_ctx); - grpc_chttp2_transport_start_reading( - self->result_->transport, args->read_buffer, - &self->on_receive_settings_, self->args_.interested_parties, nullptr); - self->timer_handle_ = self->event_engine_->RunAfter( - self->args_.deadline - Timestamp::Now(), - [self = self->RefAsSubclass()] { - ApplicationCallbackExecCtx callback_exec_ctx; - ExecCtx exec_ctx; - self->OnTimeout(); - }); - } else { - // If the handshaking succeeded but there is no endpoint, then the - // handshaker may have handed off the connection to some external - // code. Just verify that exit_early flag is set. - DCHECK(args->exit_early); - NullThenSchedClosure(DEBUG_LOCATION, &self->notify_, error); +void Chttp2Connector::OnHandshakeDone(absl::StatusOr result) { + MutexLock lock(&mu_); + if (!result.ok() || shutdown_) { + if (result.ok()) { + result = GRPC_ERROR_CREATE("connector shutdown"); } - self->handshake_mgr_.reset(); + result_->Reset(); + NullThenSchedClosure(DEBUG_LOCATION, ¬ify_, result.status()); + } else if ((*result)->endpoint != nullptr) { + result_->transport = grpc_create_chttp2_transport( + (*result)->args, std::move((*result)->endpoint), true); + CHECK_NE(result_->transport, nullptr); + result_->socket_node = + grpc_chttp2_transport_get_socket_node(result_->transport); + result_->channel_args = std::move((*result)->args); + Ref().release(); // Ref held by OnReceiveSettings() + GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this, + grpc_schedule_on_exec_ctx); + grpc_chttp2_transport_start_reading( + result_->transport, (*result)->read_buffer.c_slice_buffer(), + &on_receive_settings_, args_.interested_parties, nullptr); + timer_handle_ = event_engine_->RunAfter( + args_.deadline - Timestamp::Now(), + [self = RefAsSubclass()]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->OnTimeout(); + // Ensure the Chttp2Connector is deleted under an ExecCtx. + self.reset(); + }); + } else { + // If the handshaking succeeded but there is no endpoint, then the + // handshaker may have handed off the connection to some external + // code. Just verify that exit_early flag is set. + DCHECK((*result)->exit_early); + NullThenSchedClosure(DEBUG_LOCATION, ¬ify_, result.status()); } - self->Unref(); + handshake_mgr_.reset(); } void Chttp2Connector::OnReceiveSettings(void* arg, grpc_error_handle error) { @@ -246,10 +236,8 @@ class Chttp2SecureClientChannelFactory : public ClientChannelFactory { const grpc_resolved_address& address, const ChannelArgs& args) override { absl::StatusOr new_args = GetSecureNamingChannelArgs(args); if (!new_args.ok()) { - gpr_log(GPR_ERROR, - "Failed to create channel args during subchannel creation: %s; " - "Got args: %s", - new_args.status().ToString().c_str(), args.ToString().c_str()); + LOG(ERROR) << "Failed to create channel args during subchannel creation: " + << new_args.status() << "; Got args: " << args.ToString(); return nullptr; } RefCountedPtr s = Subchannel::Create( @@ -321,8 +309,9 @@ grpc_channel* grpc_channel_create(const char* target, grpc_channel_credentials* creds, const grpc_channel_args* c_args) { grpc_core::ExecCtx exec_ctx; - GRPC_API_TRACE("grpc_secure_channel_create(target=%s, creds=%p, args=%p)", 3, - (target, (void*)creds, (void*)c_args)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_secure_channel_create(target=" << target + << ", creds=" << (void*)creds << ", args=" << (void*)c_args << ")"; grpc_channel* channel = nullptr; grpc_error_handle error; if (creds != nullptr) { @@ -361,9 +350,9 @@ grpc_channel* grpc_channel_create_from_fd(const char* target, int fd, grpc_channel_credentials* creds, const grpc_channel_args* args) { grpc_core::ExecCtx exec_ctx; - GRPC_API_TRACE( - "grpc_channel_create_from_fd(target=%p, fd=%d, creds=%p, args=%p)", 4, - (target, fd, creds, args)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_channel_create_from_fd(target=" << target << ", fd=" << fd + << ", creds=" << creds << ", args=" << args << ")"; // For now, we only support insecure channel credentials. if (creds == nullptr || creds->type() != grpc_core::InsecureCredentials::Type()) { @@ -380,12 +369,12 @@ grpc_channel* grpc_channel_create_from_fd(const char* target, int fd, int flags = fcntl(fd, F_GETFL, 0); CHECK_EQ(fcntl(fd, F_SETFL, flags | O_NONBLOCK), 0); - grpc_endpoint* client = grpc_tcp_create_from_fd( + grpc_core::OrphanablePtr client(grpc_tcp_create_from_fd( grpc_fd_create(fd, "client", true), grpc_event_engine::experimental::ChannelArgsEndpointConfig(final_args), - "fd-client"); + "fd-client")); grpc_core::Transport* transport = - grpc_create_chttp2_transport(final_args, client, true); + grpc_create_chttp2_transport(final_args, std::move(client), true); CHECK(transport); auto channel = grpc_core::ChannelCreate( target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport); diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h index 679c7db6ce..0cb08474ca 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -41,7 +41,7 @@ class Chttp2Connector : public SubchannelConnector { void Shutdown(grpc_error_handle error) override; private: - static void OnHandshakeDone(void* arg, grpc_error_handle error); + void OnHandshakeDone(absl::StatusOr result); static void OnReceiveSettings(void* arg, grpc_error_handle error); void OnTimeout() ABSL_LOCKS_EXCLUDED(mu_); diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index b20d2a5554..f8f0c04f6a 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -84,7 +84,6 @@ #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/insecure/insecure_credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" #include "src/core/lib/uri/uri_parser.h" @@ -107,6 +106,13 @@ const char kUnixUriPrefix[] = "unix:"; const char kUnixAbstractUriPrefix[] = "unix-abstract:"; const char kVSockUriPrefix[] = "vsock:"; +struct AcceptorDeleter { + void operator()(grpc_tcp_server_acceptor* acceptor) const { + gpr_free(acceptor); + } +}; +using AcceptorPtr = std::unique_ptr; + class Chttp2ServerListener : public Server::ListenerInterface { public: static grpc_error_handle Create(Server* server, grpc_resolved_address* addr, @@ -167,15 +173,15 @@ class Chttp2ServerListener : public Server::ListenerInterface { class HandshakingState : public InternallyRefCounted { public: HandshakingState(RefCountedPtr connection_ref, - grpc_pollset* accepting_pollset, - grpc_tcp_server_acceptor* acceptor, + grpc_pollset* accepting_pollset, AcceptorPtr acceptor, const ChannelArgs& args); ~HandshakingState() override; void Orphan() override; - void Start(grpc_endpoint* endpoint, const ChannelArgs& args); + void Start(OrphanablePtr endpoint, + const ChannelArgs& args); // Needed to be able to grab an external ref in // ActiveConnection::Start() @@ -184,10 +190,10 @@ class Chttp2ServerListener : public Server::ListenerInterface { private: void OnTimeout() ABSL_LOCKS_EXCLUDED(&connection_->mu_); static void OnReceiveSettings(void* arg, grpc_error_handle /* error */); - static void OnHandshakeDone(void* arg, grpc_error_handle error); + void OnHandshakeDone(absl::StatusOr result); RefCountedPtr const connection_; grpc_pollset* const accepting_pollset_; - grpc_tcp_server_acceptor* acceptor_; + AcceptorPtr acceptor_; RefCountedPtr handshake_mgr_ ABSL_GUARDED_BY(&connection_->mu_); // State for enforcing handshake timeout on receiving HTTP/2 settings. @@ -198,8 +204,7 @@ class Chttp2ServerListener : public Server::ListenerInterface { grpc_pollset_set* const interested_parties_; }; - ActiveConnection(grpc_pollset* accepting_pollset, - grpc_tcp_server_acceptor* acceptor, + ActiveConnection(grpc_pollset* accepting_pollset, AcceptorPtr acceptor, EventEngine* event_engine, const ChannelArgs& args, MemoryOwner memory_owner); ~ActiveConnection() override; @@ -209,7 +214,7 @@ class Chttp2ServerListener : public Server::ListenerInterface { void SendGoAway(); void Start(RefCountedPtr listener, - grpc_endpoint* endpoint, const ChannelArgs& args); + OrphanablePtr endpoint, const ChannelArgs& args); // Needed to be able to grab an external ref in // Chttp2ServerListener::OnAccept() @@ -367,11 +372,11 @@ Timestamp GetConnectionDeadline(const ChannelArgs& args) { Chttp2ServerListener::ActiveConnection::HandshakingState::HandshakingState( RefCountedPtr connection_ref, - grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor, + grpc_pollset* accepting_pollset, AcceptorPtr acceptor, const ChannelArgs& args) : connection_(std::move(connection_ref)), accepting_pollset_(accepting_pollset), - acceptor_(acceptor), + acceptor_(std::move(acceptor)), handshake_mgr_(MakeRefCounted()), deadline_(GetConnectionDeadline(args)), interested_parties_(grpc_pollset_set_create()) { @@ -387,7 +392,6 @@ Chttp2ServerListener::ActiveConnection::HandshakingState::~HandshakingState() { grpc_pollset_set_del_pollset(interested_parties_, accepting_pollset_); } grpc_pollset_set_destroy(interested_parties_); - gpr_free(acceptor_); } void Chttp2ServerListener::ActiveConnection::HandshakingState::Orphan() { @@ -401,16 +405,18 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::Orphan() { } void Chttp2ServerListener::ActiveConnection::HandshakingState::Start( - grpc_endpoint* endpoint, const ChannelArgs& channel_args) { - Ref().release(); // Held by OnHandshakeDone + OrphanablePtr endpoint, const ChannelArgs& channel_args) { RefCountedPtr handshake_mgr; { MutexLock lock(&connection_->mu_); if (handshake_mgr_ == nullptr) return; handshake_mgr = handshake_mgr_; } - handshake_mgr->DoHandshake(endpoint, channel_args, deadline_, acceptor_, - OnHandshakeDone, this); + handshake_mgr->DoHandshake( + std::move(endpoint), channel_args, deadline_, acceptor_.get(), + [self = Ref()](absl::StatusOr result) { + self->OnHandshakeDone(std::move(result)); + }); } void Chttp2ServerListener::ActiveConnection::HandshakingState::OnTimeout() { @@ -444,61 +450,50 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState:: } void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( - void* arg, grpc_error_handle error) { - auto* args = static_cast(arg); - HandshakingState* self = static_cast(args->user_data); + absl::StatusOr result) { OrphanablePtr handshaking_state_ref; RefCountedPtr handshake_mgr; bool cleanup_connection = false; bool release_connection = false; { - MutexLock connection_lock(&self->connection_->mu_); - if (!error.ok() || self->connection_->shutdown_) { - std::string error_str = StatusToString(error); + MutexLock connection_lock(&connection_->mu_); + if (!result.ok() || connection_->shutdown_) { cleanup_connection = true; release_connection = true; - if (error.ok() && args->endpoint != nullptr) { - // We were shut down or stopped serving after handshaking completed - // successfully, so destroy the endpoint here. - grpc_endpoint_destroy(args->endpoint); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); - } } else { // If the handshaking succeeded but there is no endpoint, then the // handshaker may have handed off the connection to some external // code, so we can just clean up here without creating a transport. - if (args->endpoint != nullptr) { + if ((*result)->endpoint != nullptr) { RefCountedPtr transport = - grpc_create_chttp2_transport(args->args, args->endpoint, false) + grpc_create_chttp2_transport((*result)->args, + std::move((*result)->endpoint), false) ->Ref(); grpc_error_handle channel_init_err = - self->connection_->listener_->server_->SetupTransport( - transport.get(), self->accepting_pollset_, args->args, + connection_->listener_->server_->SetupTransport( + transport.get(), accepting_pollset_, (*result)->args, grpc_chttp2_transport_get_socket_node(transport.get())); if (channel_init_err.ok()) { // Use notify_on_receive_settings callback to enforce the // handshake deadline. - self->connection_->transport_ = + connection_->transport_ = DownCast(transport.get())->Ref(); - self->Ref().release(); // Held by OnReceiveSettings(). - GRPC_CLOSURE_INIT(&self->on_receive_settings_, OnReceiveSettings, - self, grpc_schedule_on_exec_ctx); + Ref().release(); // Held by OnReceiveSettings(). + GRPC_CLOSURE_INIT(&on_receive_settings_, OnReceiveSettings, this, + 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) { + if (connection_->listener_->config_fetcher_watcher_ != nullptr) { // Refs helds by OnClose() - self->connection_->Ref().release(); - on_close = &self->connection_->on_close_; + connection_->Ref().release(); + on_close = &connection_->on_close_; } else { // Remove the connection from the connections_ map since OnClose() // will not be invoked when a config fetcher is set. auto connection_quota = - self->connection_->listener_->connection_quota_->Ref() - .release(); + connection_->listener_->connection_quota_->Ref().release(); auto on_close_transport = [](void* arg, grpc_error_handle /*handle*/) { ConnectionQuota* connection_quota = @@ -511,11 +506,10 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( cleanup_connection = true; } grpc_chttp2_transport_start_reading( - transport.get(), args->read_buffer, &self->on_receive_settings_, - nullptr, on_close); - self->timer_handle_ = self->connection_->event_engine_->RunAfter( - self->deadline_ - Timestamp::Now(), - [self = self->Ref()]() mutable { + transport.get(), (*result)->read_buffer.c_slice_buffer(), + &on_receive_settings_, nullptr, on_close); + timer_handle_ = connection_->event_engine_->RunAfter( + deadline_ - Timestamp::Now(), [self = Ref()]() mutable { ApplicationCallbackExecCtx callback_exec_ctx; ExecCtx exec_ctx; self->OnTimeout(); @@ -527,8 +521,6 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( LOG(ERROR) << "Failed to create channel: " << StatusToString(channel_init_err); transport->Orphan(); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); cleanup_connection = true; release_connection = true; } @@ -541,25 +533,21 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( // 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_); + handshake_mgr = std::move(handshake_mgr_); + handshaking_state_ref = std::move(connection_->handshaking_state_); } - gpr_free(self->acceptor_); - self->acceptor_ = nullptr; OrphanablePtr connection; if (cleanup_connection) { - MutexLock listener_lock(&self->connection_->listener_->mu_); + MutexLock listener_lock(&connection_->listener_->mu_); if (release_connection) { - self->connection_->listener_->connection_quota_->ReleaseConnections(1); + connection_->listener_->connection_quota_->ReleaseConnections(1); } - auto it = self->connection_->listener_->connections_.find( - self->connection_.get()); - if (it != self->connection_->listener_->connections_.end()) { + auto it = connection_->listener_->connections_.find(connection_.get()); + if (it != connection_->listener_->connections_.end()) { connection = std::move(it->second); - self->connection_->listener_->connections_.erase(it); + connection_->listener_->connections_.erase(it); } } - self->Unref(); } // @@ -567,11 +555,11 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( // Chttp2ServerListener::ActiveConnection::ActiveConnection( - grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor, + grpc_pollset* accepting_pollset, AcceptorPtr acceptor, EventEngine* event_engine, const ChannelArgs& args, MemoryOwner memory_owner) : handshaking_state_(memory_owner.MakeOrphanable( - Ref(), accepting_pollset, acceptor, args)), + Ref(), accepting_pollset, std::move(acceptor), args)), event_engine_(event_engine) { GRPC_CLOSURE_INIT(&on_close_, ActiveConnection::OnClose, this, grpc_schedule_on_exec_ctx); @@ -625,29 +613,21 @@ void Chttp2ServerListener::ActiveConnection::SendGoAway() { } void Chttp2ServerListener::ActiveConnection::Start( - RefCountedPtr listener, grpc_endpoint* endpoint, - const ChannelArgs& args) { - RefCountedPtr handshaking_state_ref; + RefCountedPtr listener, + OrphanablePtr endpoint, const ChannelArgs& args) { listener_ = std::move(listener); - if (listener_->tcp_server_ != nullptr) { - grpc_tcp_server_ref(listener_->tcp_server_); - } + RefCountedPtr handshaking_state_ref; { - ReleasableMutexLock lock(&mu_); - if (shutdown_) { - lock.Release(); - // If the Connection is already shutdown at this point, it implies the - // owning Chttp2ServerListener and all associated ActiveConnections have - // been orphaned. The generated endpoints need to be shutdown here to - // ensure the tcp connections are closed appropriately. - grpc_endpoint_destroy(endpoint); - return; - } + MutexLock lock(&mu_); + // If the Connection is already shutdown at this point, it implies the + // owning Chttp2ServerListener and all associated ActiveConnections have + // been orphaned. + 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); + handshaking_state_ref->Start(std::move(endpoint), args); } void Chttp2ServerListener::ActiveConnection::OnClose( @@ -841,48 +821,41 @@ void Chttp2ServerListener::AcceptConnectedEndpoint( void Chttp2ServerListener::OnAccept(void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, - grpc_tcp_server_acceptor* acceptor) { + grpc_tcp_server_acceptor* server_acceptor) { Chttp2ServerListener* self = static_cast(arg); ChannelArgs args = self->args_; + OrphanablePtr endpoint(tcp); + AcceptorPtr acceptor(server_acceptor); RefCountedPtr connection_manager; { MutexLock lock(&self->mu_); connection_manager = self->connection_manager_; } - auto endpoint_cleanup = [&]() { - grpc_endpoint_destroy(tcp); - gpr_free(acceptor); - }; if (!self->connection_quota_->AllowIncomingConnection( - self->memory_quota_, grpc_endpoint_get_peer(tcp))) { - endpoint_cleanup(); + self->memory_quota_, grpc_endpoint_get_peer(endpoint.get()))) { return; } if (self->config_fetcher_ != nullptr) { if (connection_manager == nullptr) { - endpoint_cleanup(); return; } absl::StatusOr args_result = connection_manager->UpdateChannelArgsForConnection(args, tcp); if (!args_result.ok()) { - endpoint_cleanup(); return; } grpc_error_handle error; args = self->args_modifier_(*args_result, &error); if (!error.ok()) { - endpoint_cleanup(); return; } } auto memory_owner = self->memory_quota_->CreateMemoryOwner(); EventEngine* const event_engine = self->args_.GetObject(); auto connection = memory_owner.MakeOrphanable( - accepting_pollset, acceptor, event_engine, args, std::move(memory_owner)); - // We no longer own acceptor - acceptor = nullptr; + accepting_pollset, std::move(acceptor), event_engine, args, + std::move(memory_owner)); // Hold a ref to connection to allow starting handshake outside the // critical region RefCountedPtr connection_ref = connection->Ref(); @@ -893,19 +866,21 @@ void Chttp2ServerListener::OnAccept(void* arg, grpc_endpoint* tcp, // connection manager has changed. if (!self->shutdown_ && self->is_serving_ && connection_manager == self->connection_manager_) { - // 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().) + // The ref for both the listener and tcp_server need 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 listener is already shutdown. Note that the listener + // holds a ref to the tcp_server but this ref is given away when the + // listener is orphaned (shutdown). + if (self->tcp_server_ != nullptr) { + grpc_tcp_server_ref(self->tcp_server_); + } listener_ref = self->RefAsSubclass(); self->connections_.emplace(connection.get(), std::move(connection)); } } - if (connection != nullptr) { - endpoint_cleanup(); - } else { - connection_ref->Start(std::move(listener_ref), tcp, args); + if (connection == nullptr && listener_ref != nullptr) { + connection_ref->Start(std::move(listener_ref), std::move(endpoint), args); } } @@ -1103,8 +1078,8 @@ int grpc_server_add_http2_port(grpc_server* server, const char* addr, int port_num = 0; grpc_core::Server* core_server = grpc_core::Server::FromC(server); grpc_core::ChannelArgs args = core_server->channel_args(); - GRPC_API_TRACE("grpc_server_add_http2_port(server=%p, addr=%s, creds=%p)", 3, - (server, addr, creds)); + GRPC_TRACE_LOG(api, INFO) << "grpc_server_add_http2_port(server=" << server + << ", addr=" << addr << ", creds=" << creds << ")"; // Create security context. if (creds == nullptr) { err = GRPC_ERROR_CREATE( @@ -1161,15 +1136,17 @@ void grpc_server_add_channel_from_fd(grpc_server* server, int fd, std::string name = absl::StrCat("fd:", fd); auto memory_quota = server_args.GetObject()->memory_quota(); - grpc_endpoint* server_endpoint = grpc_tcp_create_from_fd( - grpc_fd_create(fd, name.c_str(), true), - grpc_event_engine::experimental::ChannelArgsEndpointConfig(server_args), - name); + grpc_core::OrphanablePtr server_endpoint( + grpc_tcp_create_from_fd( + grpc_fd_create(fd, name.c_str(), true), + grpc_event_engine::experimental::ChannelArgsEndpointConfig( + server_args), + name)); for (grpc_pollset* pollset : core_server->pollsets()) { - grpc_endpoint_add_to_pollset(server_endpoint, pollset); + grpc_endpoint_add_to_pollset(server_endpoint.get(), pollset); } grpc_core::Transport* transport = grpc_create_chttp2_transport( - server_args, server_endpoint, false // is_client + server_args, std::move(server_endpoint), false // is_client ); grpc_error_handle error = core_server->SetupTransport(transport, nullptr, server_args, nullptr); @@ -1197,8 +1174,9 @@ absl::Status grpc_server_add_passive_listener( std::shared_ptr passive_listener) { grpc_core::ExecCtx exec_ctx; - GRPC_API_TRACE("grpc_server_add_passive_listener(server=%p, credentials=%p)", - 2, (server, credentials)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_server_add_passive_listener(server=" << server + << ", credentials=" << credentials << ")"; // Create security context. if (credentials == nullptr) { return absl::UnavailableError( diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc index ff23af19c3..8d00da86e5 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -20,9 +20,9 @@ #include "absl/base/attributes.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include #include "src/core/lib/slice/slice.h" @@ -58,10 +58,8 @@ static bool input_is_valid(const uint8_t* input_ptr, size_t length) { for (i = 0; i < length; ++i) { if (GPR_UNLIKELY((decode_table[input_ptr[i]] & 0xC0) != 0)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed, invalid character '%c' in base64 " - "input.\n", - static_cast(*input_ptr)); + LOG(ERROR) << "Base64 decoding failed, invalid character '" + << static_cast(*input_ptr) << "' in base64 input.\n"; return false; } } @@ -89,17 +87,14 @@ size_t grpc_chttp2_base64_infer_length_after_decode(const grpc_slice& slice) { len--; } if (GPR_UNLIKELY(GRPC_SLICE_LENGTH(slice) - len > 2)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed. Input has more than 2 paddings."); + LOG(ERROR) << "Base64 decoding failed. Input has more than 2 paddings."; return 0; } size_t tuples = len / 4; size_t tail_case = len % 4; if (GPR_UNLIKELY(tail_case == 1)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed. Input has a length of %zu (without" - " padding), which is invalid.\n", - len); + LOG(ERROR) << "Base64 decoding failed. Input has a length of " << len + << " (without padding), which is invalid.\n"; return 0; } return tuples * 3 + tail_xtra[tail_case]; @@ -167,11 +162,9 @@ grpc_slice grpc_chttp2_base64_decode(const grpc_slice& input) { grpc_slice output; if (GPR_UNLIKELY(input_length % 4 != 0)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed, input of " - "grpc_chttp2_base64_decode has a length of %d, which is not a " - "multiple of 4.\n", - static_cast(input_length)); + LOG(ERROR) << "Base64 decoding failed, input of " + "grpc_chttp2_base64_decode has a length of " + << input_length << ", which is not a multiple of 4.\n"; return grpc_empty_slice(); } @@ -194,7 +187,7 @@ grpc_slice grpc_chttp2_base64_decode(const grpc_slice& input) { if (GPR_UNLIKELY(!grpc_base64_decode_partial(&ctx))) { char* s = grpc_slice_to_c_string(input); - gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); + LOG(ERROR) << "Base64 decoding failed, input string:\n" << s << "\n"; gpr_free(s); grpc_core::CSliceUnref(output); return grpc_empty_slice(); @@ -212,23 +205,18 @@ grpc_slice grpc_chttp2_base64_decode_with_length(const grpc_slice& input, // The length of a base64 string cannot be 4 * n + 1 if (GPR_UNLIKELY(input_length % 4 == 1)) { - gpr_log(GPR_ERROR, - "Base64 decoding failed, input of " - "grpc_chttp2_base64_decode_with_length has a length of %d, which " - "has a tail of 1 byte.\n", - static_cast(input_length)); + LOG(ERROR) << "Base64 decoding failed, input of " + "grpc_chttp2_base64_decode_with_length has a length of " + << input_length << ", which has a tail of 1 byte.\n"; grpc_core::CSliceUnref(output); return grpc_empty_slice(); } if (GPR_UNLIKELY(output_length > input_length / 4 * 3 + tail_xtra[input_length % 4])) { - gpr_log( - GPR_ERROR, - "Base64 decoding failed, output_length %d is longer " - "than the max possible output length %d.\n", - static_cast(output_length), - static_cast(input_length / 4 * 3 + tail_xtra[input_length % 4])); + LOG(ERROR) << "Base64 decoding failed, output_length " << output_length + << " is longer than the max possible output length " + << (input_length / 4 * 3 + tail_xtra[input_length % 4]) << ".\n"; grpc_core::CSliceUnref(output); return grpc_empty_slice(); } @@ -241,7 +229,7 @@ grpc_slice grpc_chttp2_base64_decode_with_length(const grpc_slice& input, if (GPR_UNLIKELY(!grpc_base64_decode_partial(&ctx))) { char* s = grpc_slice_to_c_string(input); - gpr_log(GPR_ERROR, "Base64 decoding failed, input string:\n%s\n", s); + LOG(ERROR) << "Base64 decoding failed, input string:\n" << s << "\n"; gpr_free(s); grpc_core::CSliceUnref(output); return grpc_empty_slice(); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index fe00b2e4bd..2d49792ba2 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -53,7 +53,6 @@ #include #include #include -#include #include #include @@ -84,6 +83,7 @@ #include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/combiner.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -257,6 +257,7 @@ grpc_core::CopyContextFn g_get_copied_context_fn = nullptr; namespace grpc_core { namespace { + // Initialize a grpc_closure \a c to call \a Fn with \a t and \a error. Holds // the passed in reference to \a t until it's moved into Fn. template , grpc_error_handle)> @@ -272,13 +273,12 @@ grpc_closure* InitTransportClosure(RefCountedPtr t, t.release(), nullptr); return c; } -} // namespace -namespace { TestOnlyGlobalHttp2TransportInitCallback test_only_init_callback = nullptr; TestOnlyGlobalHttp2TransportDestructCallback test_only_destruct_callback = nullptr; bool test_only_disable_transient_failure_state_notification = false; + } // namespace void TestOnlySetGlobalHttp2TransportInitCallback( @@ -361,6 +361,34 @@ std::string HttpAnnotation::ToString() const { return s; } +void Chttp2CallTracerWrapper::RecordIncomingBytes( + const CallTracerInterface::TransportByteSize& transport_byte_size) { + // Update legacy API. + stream_->stats.incoming.framing_bytes += transport_byte_size.framing_bytes; + stream_->stats.incoming.data_bytes += transport_byte_size.data_bytes; + stream_->stats.incoming.header_bytes += transport_byte_size.header_bytes; + // Update new API. + if (!IsCallTracerInTransportEnabled()) return; + auto* call_tracer = stream_->arena->GetContext(); + if (call_tracer != nullptr) { + call_tracer->RecordIncomingBytes(transport_byte_size); + } +} + +void Chttp2CallTracerWrapper::RecordOutgoingBytes( + const CallTracerInterface::TransportByteSize& transport_byte_size) { + // Update legacy API. + stream_->stats.outgoing.framing_bytes += transport_byte_size.framing_bytes; + stream_->stats.outgoing.data_bytes += transport_byte_size.data_bytes; + stream_->stats.outgoing.header_bytes += + transport_byte_size.header_bytes; // Update new API. + if (!IsCallTracerInTransportEnabled()) return; + auto* call_tracer = stream_->arena->GetContext(); + if (call_tracer != nullptr) { + call_tracer->RecordOutgoingBytes(transport_byte_size); + } +} + } // namespace grpc_core // @@ -378,8 +406,6 @@ grpc_chttp2_transport::~grpc_chttp2_transport() { channelz_socket.reset(); } - if (ep != nullptr) grpc_endpoint_destroy(ep); - grpc_slice_buffer_destroy(&qbuf); grpc_error_handle error = GRPC_ERROR_CREATE("Transport destroyed"); @@ -420,9 +446,9 @@ static void read_channel_args(grpc_chttp2_transport* t, channel_args.GetInt(GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER).value_or(-1); if (initial_sequence_number > 0) { if ((t->next_stream_id & 1) != (initial_sequence_number & 1)) { - gpr_log(GPR_ERROR, "%s: low bit must be %d on %s", - GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER, t->next_stream_id & 1, - is_client ? "client" : "server"); + LOG(ERROR) << GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER + << ": low bit must be " << (t->next_stream_id & 1) << " on " + << (is_client ? "client" : "server"); } else { t->next_stream_id = static_cast(initial_sequence_number); } @@ -458,15 +484,11 @@ static void read_channel_args(grpc_chttp2_transport* t, if (t->is_client) { t->keepalive_permit_without_calls = channel_args.GetBool(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS) - .value_or(grpc_core::IsKeepaliveFixEnabled() - ? g_default_client_keepalive_permit_without_calls - : false); + .value_or(g_default_client_keepalive_permit_without_calls); } else { t->keepalive_permit_without_calls = channel_args.GetBool(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS) - .value_or(grpc_core::IsKeepaliveServerFixEnabled() - ? g_default_server_keepalive_permit_without_calls - : false); + .value_or(g_default_server_keepalive_permit_without_calls); } t->settings_timeout = @@ -495,7 +517,7 @@ static void read_channel_args(grpc_chttp2_transport* t, .value_or(GRPC_ENABLE_CHANNELZ_DEFAULT)) { t->channelz_socket = grpc_core::MakeRefCounted( - std::string(grpc_endpoint_get_local_address(t->ep)), + std::string(grpc_endpoint_get_local_address(t->ep.get())), std::string(t->peer_string.as_string_view()), absl::StrCat(t->GetTransportName(), " ", t->peer_string.as_string_view()), @@ -528,8 +550,8 @@ static void read_channel_args(grpc_chttp2_transport* t, t->max_concurrent_streams_policy.SetTarget(value); } } else if (channel_args.Contains(GRPC_ARG_MAX_CONCURRENT_STREAMS)) { - gpr_log(GPR_DEBUG, "%s is not available on clients", - GRPC_ARG_MAX_CONCURRENT_STREAMS); + VLOG(2) << GRPC_ARG_MAX_CONCURRENT_STREAMS + << " is not available on clients"; } value = channel_args.GetInt(GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_DECODER).value_or(-1); @@ -589,11 +611,11 @@ using grpc_event_engine::experimental::QueryExtension; using grpc_event_engine::experimental::TcpTraceExtension; grpc_chttp2_transport::grpc_chttp2_transport( - const grpc_core::ChannelArgs& channel_args, grpc_endpoint* ep, - bool is_client) - : ep(ep), + const grpc_core::ChannelArgs& channel_args, + grpc_core::OrphanablePtr endpoint, bool is_client) + : ep(std::move(endpoint)), peer_string( - grpc_core::Slice::FromCopiedString(grpc_endpoint_get_peer(ep))), + grpc_core::Slice::FromCopiedString(grpc_endpoint_get_peer(ep.get()))), memory_owner(channel_args.GetObject() ->memory_quota() ->CreateMemoryOwner()), @@ -617,10 +639,11 @@ grpc_chttp2_transport::grpc_chttp2_transport( context_list = new grpc_core::ContextList(); if (channel_args.GetBool(GRPC_ARG_TCP_TRACING_ENABLED).value_or(false) && - grpc_event_engine::experimental::grpc_is_event_engine_endpoint(ep)) { + grpc_event_engine::experimental::grpc_is_event_engine_endpoint( + ep.get())) { auto epte = QueryExtension( grpc_event_engine::experimental::grpc_get_wrapped_event_engine_endpoint( - ep)); + ep.get())); if (epte != nullptr) { epte->InitializeAndReturnTcpTracer(); } @@ -763,17 +786,16 @@ static void close_transport_locked(grpc_chttp2_transport* t, CHECK(t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE); if (t->interested_parties_until_recv_settings != nullptr) { grpc_endpoint_delete_from_pollset_set( - t->ep, t->interested_parties_until_recv_settings); + t->ep.get(), t->interested_parties_until_recv_settings); t->interested_parties_until_recv_settings = nullptr; } grpc_core::MutexLock lock(&t->ep_destroy_mu); - grpc_endpoint_destroy(t->ep); - t->ep = nullptr; + t->ep.reset(); } if (t->notify_on_receive_settings != nullptr) { if (t->interested_parties_until_recv_settings != nullptr) { grpc_endpoint_delete_from_pollset_set( - t->ep, t->interested_parties_until_recv_settings); + t->ep.get(), t->interested_parties_until_recv_settings); t->interested_parties_until_recv_settings = nullptr; } grpc_core::ExecCtx::Run(DEBUG_LOCATION, t->notify_on_receive_settings, @@ -820,7 +842,8 @@ grpc_chttp2_stream::grpc_chttp2_stream(grpc_chttp2_transport* t, return refcount; }()), arena(arena), - flow_control(&t->flow_control) { + flow_control(&t->flow_control), + call_tracer_wrapper(this) { t->streams_allocated.fetch_add(1, std::memory_order_relaxed); if (server_data) { id = static_cast(reinterpret_cast(server_data)); @@ -927,11 +950,11 @@ static const char* write_state_name(grpc_chttp2_write_state st) { static void set_write_state(grpc_chttp2_transport* t, grpc_chttp2_write_state st, const char* reason) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, "W:%p %s [%s] state %s -> %s [%s]", t, - t->is_client ? "CLIENT" : "SERVER", - std::string(t->peer_string.as_string_view()).c_str(), - write_state_name(t->write_state), write_state_name(st), reason)); + GRPC_TRACE_LOG(http, INFO) + << "W:" << t << " " << (t->is_client ? "CLIENT" : "SERVER") << " [" + << t->peer_string.as_string_view() << "] state " + << write_state_name(t->write_state) << " -> " << write_state_name(st) + << " [" << reason << "]"; t->write_state = st; // If the state is being reset back to idle, it means a write was just // finished. Make sure all the run_after_write closures are scheduled. @@ -1021,11 +1044,10 @@ static void write_action_begin_locked( // We had paused reading, because we had many induced frames (SETTINGS // ACK, PINGS ACK and RST_STREAMS) pending in t->qbuf. Now that we have // been able to flush qbuf, we can resume reading. - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, - "transport %p : Resuming reading after being paused due to too " - "many unwritten SETTINGS ACK, PINGS ACK and RST_STREAM frames", - t.get())); + GRPC_TRACE_LOG(http, INFO) + << "transport " << t.get() + << " : Resuming reading after being paused due to too many unwritten " + "SETTINGS ACK, PINGS ACK and RST_STREAM frames"; t->reading_paused_on_pending_induced_frames = false; continue_read_action_locked(std::move(t)); } @@ -1061,7 +1083,7 @@ static void write_action(grpc_chttp2_transport* t) { << (t->is_client ? "CLIENT" : "SERVER") << "[" << t << "]: Write " << t->outbuf.Length() << " bytes"; t->write_size_policy.BeginWrite(t->outbuf.Length()); - grpc_endpoint_write(t->ep, t->outbuf.c_slice_buffer(), + grpc_endpoint_write(t->ep.get(), t->outbuf.c_slice_buffer(), grpc_core::InitTransportClosure( t->Ref(), &t->write_action_end_locked), cl, max_frame_size); @@ -1152,15 +1174,15 @@ void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, static_cast(goaway_error)), grpc_core::StatusIntProperty::kRpcStatus, GRPC_STATUS_UNAVAILABLE); - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, "transport %p got goaway with last stream id %d", t, - last_stream_id)); + GRPC_TRACE_LOG(http, INFO) + << "transport " << t << " got goaway with last stream id " + << last_stream_id; // We want to log this irrespective of whether http tracing is enabled if we // 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", - std::string(t->peer_string.as_string_view()).c_str(), goaway_error, - grpc_core::StatusToString(t->goaway_error).c_str()); + LOG(INFO) << t->peer_string.as_string_view() << ": Got goaway [" + << goaway_error + << "] err=" << grpc_core::StatusToString(t->goaway_error); } if (t->is_client) { cancel_unstarted_streams(t, t->goaway_error, false); @@ -1186,12 +1208,11 @@ void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, if (GPR_UNLIKELY(t->is_client && goaway_error == GRPC_HTTP2_ENHANCE_YOUR_CALM && goaway_text == "too_many_pings")) { - gpr_log(GPR_ERROR, - "%s: Received a GOAWAY with error code ENHANCE_YOUR_CALM and debug " - "data equal to \"too_many_pings\". Current keepalive time (before " - "throttling): %s", - std::string(t->peer_string.as_string_view()).c_str(), - t->keepalive_time.ToString().c_str()); + LOG(ERROR) << t->peer_string.as_string_view() + << ": Received a GOAWAY with error code ENHANCE_YOUR_CALM and " + "debug data equal to \"too_many_pings\". Current keepalive " + "time (before throttling): " + << t->keepalive_time.ToString(); constexpr int max_keepalive_time_millis = INT_MAX / KEEPALIVE_TIME_BACKOFF_MULTIPLIER; int64_t throttled_keepalive_time = @@ -1223,10 +1244,10 @@ static void maybe_start_some_streams(grpc_chttp2_transport* t) { t->stream_map.size() < t->settings.peer().max_concurrent_streams() && grpc_chttp2_list_pop_waiting_for_concurrency(t, &s)) { // safe since we can't (legally) be parsing this stream yet - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, - "HTTP:%s: Transport %p allocating new grpc_chttp2_stream %p to id %d", - t->is_client ? "CLI" : "SVR", t, s, t->next_stream_id)); + GRPC_TRACE_LOG(http, INFO) + << "HTTP:" << (t->is_client ? "CLI" : "SVR") << ": Transport " << t + << " allocating new grpc_chttp2_stream " << s << " to id " + << t->next_stream_id; CHECK_EQ(s->id, 0u); s->id = t->next_stream_id; @@ -1289,17 +1310,13 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, } closure->next_data.scratch -= CLOSURE_BARRIER_FIRST_REF_BIT; if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log( - GPR_INFO, - "complete_closure_step: t=%p %p refs=%d flags=0x%04x desc=%s err=%s " - "write_state=%s whence=%s:%d", - t, closure, - static_cast(closure->next_data.scratch / - CLOSURE_BARRIER_FIRST_REF_BIT), - static_cast(closure->next_data.scratch % - CLOSURE_BARRIER_FIRST_REF_BIT), - desc, grpc_core::StatusToString(error).c_str(), - write_state_name(t->write_state), whence.file(), whence.line()); + LOG(INFO) << "complete_closure_step: t=" << t << " " << closure << " refs=" + << (closure->next_data.scratch / CLOSURE_BARRIER_FIRST_REF_BIT) + << " flags=" + << (closure->next_data.scratch % CLOSURE_BARRIER_FIRST_REF_BIT) + << " desc=" << desc << " err=" << grpc_core::StatusToString(error) + << " write_state=" << write_state_name(t->write_state) + << " whence=" << whence.file() << ":" << whence.line(); } if (!error.ok()) { @@ -1342,7 +1359,7 @@ static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, const std::string prefix = absl::StrCat( "HTTP:", id, is_initial ? ":HDR" : ":TRL", is_client ? ":CLI:" : ":SVR:"); md_batch->Log([&prefix](absl::string_view key, absl::string_view value) { - VLOG(2) << absl::StrCat(prefix, key, ": ", value); + VLOG(2) << prefix << key << ": " << value; }); } @@ -1356,13 +1373,14 @@ static void perform_stream_op_locked(void* stream_op, grpc_chttp2_transport* t = s->t.get(); s->traced = op->is_traced; - s->call_tracer = CallTracerIfSampled(s); + if (!grpc_core::IsCallTracerInTransportEnabled()) { + s->call_tracer = CallTracerIfSampled(s); + } s->tcp_tracer = TcpTracerIfSampled(s); if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, - "perform_stream_op_locked[s=%p; op=%p]: %s; on_complete = %p", s, - op, grpc_transport_stream_op_batch_string(op, false).c_str(), - op->on_complete); + LOG(INFO) << "perform_stream_op_locked[s=" << s << "; op=" << op + << "]: " << grpc_transport_stream_op_batch_string(op, false) + << "; on_complete = " << op->on_complete; if (op->send_initial_metadata) { log_metadata(op_payload->send_initial_metadata.send_initial_metadata, s->id, t->is_client, true); @@ -1388,12 +1406,24 @@ static void perform_stream_op_locked(void* stream_op, } if (op->send_initial_metadata) { - if (s->call_tracer != nullptr) { - s->call_tracer->RecordAnnotation( - grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kStart, - gpr_now(GPR_CLOCK_REALTIME)) - .Add(s->t->flow_control.stats()) - .Add(s->flow_control.stats())); + if (!grpc_core::IsCallTracerInTransportEnabled()) { + if (s->call_tracer != nullptr) { + s->call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kStart, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s->t->flow_control.stats()) + .Add(s->flow_control.stats())); + } + } else if (grpc_core::IsTraceRecordCallopsEnabled()) { + auto* call_tracer = + s->arena->GetContext(); + if (call_tracer != nullptr && call_tracer->IsSampled()) { + call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kStart, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s->t->flow_control.stats()) + .Add(s->flow_control.stats())); + } } if (t->is_client && t->channelz_socket != nullptr) { t->channelz_socket->RecordStreamStartedFromLocal(); @@ -1477,11 +1507,8 @@ static void perform_stream_op_locked(void* stream_op, frame_hdr[3] = static_cast(len >> 8); frame_hdr[4] = static_cast(len); - if (grpc_core::IsHttp2StatsFixEnabled()) { - s->stats.outgoing.framing_bytes += GRPC_HEADER_SIZE_IN_BYTES; - s->stats.outgoing.data_bytes += - op_payload->send_message.send_message->Length(); - } + s->call_tracer_wrapper.RecordOutgoingBytes( + {GRPC_HEADER_SIZE_IN_BYTES, len, 0}); s->next_message_end_offset = s->flow_controlled_bytes_written + static_cast(s->flow_controlled_buffer.length) + @@ -1626,8 +1653,8 @@ void grpc_chttp2_transport::PerformStreamOp( } if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "perform_stream_op[s=%p; op=%p]: %s", s, op, - grpc_transport_stream_op_batch_string(op, false).c_str()); + LOG(INFO) << "perform_stream_op[s=" << s << "; op=" << op + << "]: " << grpc_transport_stream_op_batch_string(op, false); } GRPC_CHTTP2_STREAM_REF(s, "perform_stream_op"); @@ -1638,8 +1665,8 @@ void grpc_chttp2_transport::PerformStreamOp( } static void cancel_pings(grpc_chttp2_transport* t, grpc_error_handle error) { - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "%p CANCEL PINGS: %s", t, - grpc_core::StatusToString(error).c_str())); + GRPC_TRACE_LOG(http, INFO) + << t << " CANCEL PINGS: " << grpc_core::StatusToString(error); // callback remaining pings: they're not allowed to call into the transport, // and maybe they hold resources that need to be freed t->ping_callbacks.CancelAll(t->event_engine.get()); @@ -1722,8 +1749,8 @@ static void retry_initiate_ping_locked( void grpc_chttp2_ack_ping(grpc_chttp2_transport* t, uint64_t id) { if (!t->ping_callbacks.AckPing(id, t->event_engine.get())) { - gpr_log(GPR_DEBUG, "Unknown ping response from %s: %" PRIx64, - std::string(t->peer_string.as_string_view()).c_str(), id); + VLOG(2) << "Unknown ping response from " << t->peer_string.as_string_view() + << ": " << id; return; } if (t->ping_callbacks.ping_requested()) { @@ -1735,8 +1762,8 @@ void grpc_chttp2_keepalive_timeout( grpc_core::RefCountedPtr t) { t->combiner->Run( grpc_core::NewClosure([t](grpc_error_handle) { - gpr_log(GPR_INFO, "%s: Keepalive timeout. Closing transport.", - std::string(t->peer_string.as_string_view()).c_str()); + GRPC_TRACE_LOG(http, INFO) << t->peer_string.as_string_view() + << ": Keepalive timeout. Closing transport."; send_goaway( t.get(), grpc_error_set_int(GRPC_ERROR_CREATE("keepalive_timeout"), @@ -1756,8 +1783,8 @@ void grpc_chttp2_ping_timeout( grpc_core::RefCountedPtr t) { t->combiner->Run( grpc_core::NewClosure([t](grpc_error_handle) { - gpr_log(GPR_INFO, "%s: Ping timeout. Closing transport.", - std::string(t->peer_string.as_string_view()).c_str()); + GRPC_TRACE_LOG(http, INFO) << t->peer_string.as_string_view() + << ": Ping timeout. Closing transport."; send_goaway( t.get(), grpc_error_set_int(GRPC_ERROR_CREATE("ping_timeout"), @@ -1777,8 +1804,8 @@ void grpc_chttp2_settings_timeout( grpc_core::RefCountedPtr t) { t->combiner->Run( grpc_core::NewClosure([t](grpc_error_handle) { - gpr_log(GPR_INFO, "%s: Settings timeout. Closing transport.", - std::string(t->peer_string.as_string_view()).c_str()); + GRPC_TRACE_LOG(http, INFO) << t->peer_string.as_string_view() + << ": Settings timeout. Closing transport."; send_goaway( t.get(), grpc_error_set_int(GRPC_ERROR_CREATE("settings_timeout"), @@ -1828,22 +1855,21 @@ class GracefulGoaway : public grpc_core::RefCounted { return; } if (t_->destroying || !t_->closed_with_error.ok()) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, - "transport:%p %s peer:%s Transport already shutting down. " - "Graceful GOAWAY abandoned.", - t_.get(), t_->is_client ? "CLIENT" : "SERVER", - std::string(t_->peer_string.as_string_view()).c_str())); + GRPC_TRACE_LOG(http, INFO) << "transport:" << t_.get() << " " + << (t_->is_client ? "CLIENT" : "SERVER") + << " peer:" << t_->peer_string.as_string_view() + << " Transport already shutting down. " + "Graceful GOAWAY abandoned."; return; } // Ping completed. Send final goaway. - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, - "transport:%p %s peer:%s Graceful shutdown: Ping received. " - "Sending final GOAWAY with stream_id:%d", - t_.get(), t_->is_client ? "CLIENT" : "SERVER", - std::string(t_->peer_string.as_string_view()).c_str(), - t_->last_new_stream_id)); + GRPC_TRACE_LOG(http, INFO) + << "transport:" << t_.get() << " " + << (t_->is_client ? "CLIENT" : "SERVER") + << " peer:" << std::string(t_->peer_string.as_string_view()) + << " Graceful shutdown: Ping received. " + "Sending final GOAWAY with stream_id:" + << t_->last_new_stream_id; t_->sent_goaway_state = GRPC_CHTTP2_FINAL_GOAWAY_SEND_SCHEDULED; grpc_chttp2_goaway_append(t_->last_new_stream_id, 0, grpc_empty_slice(), &t_->qbuf); @@ -1887,10 +1913,10 @@ static void send_goaway(grpc_chttp2_transport* t, grpc_error_handle error, } else if (t->sent_goaway_state == GRPC_CHTTP2_NO_GOAWAY_SEND || t->sent_goaway_state == GRPC_CHTTP2_GRACEFUL_GOAWAY) { // We want to log this irrespective of whether http tracing is enabled - gpr_log(GPR_DEBUG, "%s %s: Sending goaway last_new_stream_id=%d err=%s", - std::string(t->peer_string.as_string_view()).c_str(), - t->is_client ? "CLIENT" : "SERVER", t->last_new_stream_id, - grpc_core::StatusToString(error).c_str()); + VLOG(2) << t->peer_string.as_string_view() << " " + << (t->is_client ? "CLIENT" : "SERVER") + << ": Sending goaway last_new_stream_id=" << t->last_new_stream_id + << " err=" << grpc_core::StatusToString(error); t->sent_goaway_state = GRPC_CHTTP2_FINAL_GOAWAY_SEND_SCHEDULED; grpc_chttp2_goaway_append( t->last_new_stream_id, static_cast(http_error), @@ -1939,13 +1965,13 @@ static void perform_transport_op_locked(void* stream_op, if (op->bind_pollset) { if (t->ep != nullptr) { - grpc_endpoint_add_to_pollset(t->ep, op->bind_pollset); + grpc_endpoint_add_to_pollset(t->ep.get(), op->bind_pollset); } } if (op->bind_pollset_set) { if (t->ep != nullptr) { - grpc_endpoint_add_to_pollset_set(t->ep, op->bind_pollset_set); + grpc_endpoint_add_to_pollset_set(t->ep.get(), op->bind_pollset_set); } } @@ -1974,8 +2000,8 @@ static void perform_transport_op_locked(void* stream_op, void grpc_chttp2_transport::PerformOp(grpc_transport_op* op) { if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "perform_transport_op[t=%p]: %s", this, - grpc_transport_op_string(op).c_str()); + LOG(INFO) << "perform_transport_op[t=" << this + << "]: " << grpc_transport_op_string(op); } op->handler_private.extra_arg = this; Ref().release()->combiner->Run( @@ -2027,10 +2053,9 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, // exited out of at any point by returning. [&]() { if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_DEBUG, - "maybe_complete_recv_message %p final_metadata_requested=%d " - "seen_error=%d", - s, s->final_metadata_requested, s->seen_error); + VLOG(2) << "maybe_complete_recv_message " << s + << " final_metadata_requested=" << s->final_metadata_requested + << " seen_error=" << s->seen_error; } if (s->final_metadata_requested && s->seen_error) { grpc_slice_buffer_reset_and_unref(&s->frame_storage); @@ -2043,10 +2068,9 @@ void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* t, auto r = grpc_deframe_unprocessed_incoming_frames( s, &min_progress_size, &**s->recv_message, s->recv_message_flags); if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_DEBUG, "Deframe data frame: %s", - grpc_core::PollToString(r, [](absl::Status r) { - return r.ToString(); - }).c_str()); + VLOG(2) << "Deframe data frame: " + << grpc_core::PollToString( + r, [](absl::Status r) { return r.ToString(); }); } if (r.pending()) { if (s->read_closed) { @@ -2099,12 +2123,11 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { grpc_chttp2_maybe_complete_recv_message(t, s); if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_DEBUG, - "maybe_complete_recv_trailing_metadata cli=%d s=%p closure=%p " - "read_closed=%d " - "write_closed=%d %" PRIdPTR, - t->is_client, s, s->recv_trailing_metadata_finished, s->read_closed, - s->write_closed, s->frame_storage.length); + VLOG(2) << "maybe_complete_recv_trailing_metadata cli=" << t->is_client + << " s=" << s << " closure=" << s->recv_trailing_metadata_finished + << " read_closed=" << s->read_closed + << " write_closed=" << s->write_closed << " " + << s->frame_storage.length; } if (s->recv_trailing_metadata_finished != nullptr && s->read_closed && s->write_closed) { @@ -2310,12 +2333,13 @@ grpc_chttp2_transport::RemovedStreamHandle grpc_chttp2_mark_stream_closed( int close_writes, grpc_error_handle error) { grpc_chttp2_transport::RemovedStreamHandle rsh; if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log( - GPR_DEBUG, "MARK_STREAM_CLOSED: t=%p s=%p(id=%d) %s [%s]", t, s, s->id, - (close_reads && close_writes) - ? "read+write" - : (close_reads ? "read" : (close_writes ? "write" : "nothing??")), - grpc_core::StatusToString(error).c_str()); + VLOG(2) << "MARK_STREAM_CLOSED: t=" << t << " s=" << s << "(id=" << s->id + << ") " + << ((close_reads && close_writes) + ? "read+write" + : (close_reads ? "read" + : (close_writes ? "write" : "nothing??"))) + << " [" << grpc_core::StatusToString(error) << "]"; } if (s->read_closed && s->write_closed) { // already closed, but we should still fake the status if needed. @@ -2723,11 +2747,10 @@ static void read_action_parse_loop_locked( if (keep_reading) { if (t->num_pending_induced_frames >= DEFAULT_MAX_PENDING_INDUCED_FRAMES) { t->reading_paused_on_pending_induced_frames = true; - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, - "transport %p : Pausing reading due to too " - "many unwritten SETTINGS ACK and RST_STREAM frames", - t.get())); + GRPC_TRACE_LOG(http, INFO) + << "transport " << t.get() + << " : Pausing reading due to too many unwritten " + "SETTINGS ACK and RST_STREAM frames"; } else { continue_read_action_locked(std::move(t)); } @@ -2742,9 +2765,8 @@ static void read_action_locked( if (t->keepalive_ping_timeout_handle != TaskHandle::kInvalid) { if (GRPC_TRACE_FLAG_ENABLED(http2_ping) || GRPC_TRACE_FLAG_ENABLED(http_keepalive)) { - gpr_log(GPR_INFO, - "%s[%p]: Clear keepalive timer because data was received", - t->is_client ? "CLIENT" : "SERVER", t.get()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t.get() + << "]: Clear keepalive timer because data was received"; } t->event_engine->Cancel( std::exchange(t->keepalive_ping_timeout_handle, TaskHandle::kInvalid)); @@ -2763,7 +2785,7 @@ static void continue_read_action_locked( grpc_core::RefCountedPtr t) { const bool urgent = !t->goaway_error.ok(); auto* tp = t.get(); - grpc_endpoint_read(tp->ep, &tp->read_buffer, + grpc_endpoint_read(tp->ep.get(), &tp->read_buffer, grpc_core::InitTransportClosure( std::move(t), &tp->read_action_locked), urgent, grpc_chttp2_min_read_progress_size(tp)); @@ -2795,9 +2817,8 @@ static void start_bdp_ping_locked( grpc_core::RefCountedPtr t, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "%s: Start BDP ping err=%s", - std::string(t->peer_string.as_string_view()).c_str(), - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << t->peer_string.as_string_view() + << ": Start BDP ping err=" << grpc_core::StatusToString(error); } if (!error.ok() || !t->closed_with_error.ok()) { return; @@ -2822,9 +2843,8 @@ static void finish_bdp_ping_locked( grpc_core::RefCountedPtr t, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "%s: Complete BDP ping err=%s", - std::string(t->peer_string.as_string_view()).c_str(), - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << t->peer_string.as_string_view() + << ": Complete BDP ping err=" << grpc_core::StatusToString(error); } if (!error.ok() || !t->closed_with_error.ok()) { return; @@ -2967,8 +2987,8 @@ static void finish_keepalive_ping_locked( if (error.ok()) { if (GRPC_TRACE_FLAG_ENABLED(http) || GRPC_TRACE_FLAG_ENABLED(http_keepalive)) { - gpr_log(GPR_INFO, "%s: Finish keepalive ping", - std::string(t->peer_string.as_string_view()).c_str()); + LOG(INFO) << t->peer_string.as_string_view() + << ": Finish keepalive ping"; } t->keepalive_state = GRPC_CHTTP2_KEEPALIVE_STATE_WAITING; CHECK(t->keepalive_ping_timer_handle == TaskHandle::kInvalid); @@ -2989,8 +3009,8 @@ static void maybe_reset_keepalive_ping_timer_locked(grpc_chttp2_transport* t) { // need to Ref or Unref here since we still hold the Ref. if (GRPC_TRACE_FLAG_ENABLED(http) || GRPC_TRACE_FLAG_ENABLED(http_keepalive)) { - gpr_log(GPR_INFO, "%s: Keepalive ping cancelled. Resetting timer.", - std::string(t->peer_string.as_string_view()).c_str()); + LOG(INFO) << t->peer_string.as_string_view() + << ": Keepalive ping cancelled. Resetting timer."; } t->keepalive_ping_timer_handle = t->event_engine->RunAfter(t->keepalive_time, [t = t->Ref()]() mutable { @@ -3009,9 +3029,9 @@ static void connectivity_state_set(grpc_chttp2_transport* t, grpc_connectivity_state state, const absl::Status& status, const char* reason) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, "transport %p set connectivity_state=%d; status=%s; reason=%s", - t, state, status.ToString().c_str(), reason)); + GRPC_TRACE_LOG(http, INFO) + << "transport " << t << " set connectivity_state=" << state + << "; status=" << status.ToString() << "; reason=" << reason; t->state_tracker.SetState(state, status, reason); } @@ -3026,7 +3046,7 @@ void grpc_chttp2_transport::SetPollset(grpc_stream* /*gs*/, // actually uses pollsets. if (strcmp(grpc_get_poll_strategy_name(), "poll") != 0) return; grpc_core::MutexLock lock(&ep_destroy_mu); - if (ep != nullptr) grpc_endpoint_add_to_pollset(ep, pollset); + if (ep != nullptr) grpc_endpoint_add_to_pollset(ep.get(), pollset); } void grpc_chttp2_transport::SetPollsetSet(grpc_stream* /*gs*/, @@ -3036,7 +3056,7 @@ void grpc_chttp2_transport::SetPollsetSet(grpc_stream* /*gs*/, // actually uses pollsets. if (strcmp(grpc_get_poll_strategy_name(), "poll") != 0) return; grpc_core::MutexLock lock(&ep_destroy_mu); - if (ep != nullptr) grpc_endpoint_add_to_pollset_set(ep, pollset_set); + if (ep != nullptr) grpc_endpoint_add_to_pollset_set(ep.get(), pollset_set); } // @@ -3088,8 +3108,8 @@ static void benign_reclaimer_locked( // Channel with no active streams: send a goaway to try and make it // disconnect cleanly if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - gpr_log(GPR_INFO, "HTTP2: %s - send goaway to free memory", - std::string(t->peer_string.as_string_view()).c_str()); + LOG(INFO) << "HTTP2: " << t->peer_string.as_string_view() + << " - send goaway to free memory"; } send_goaway(t.get(), grpc_error_set_int(GRPC_ERROR_CREATE("Buffers full"), @@ -3097,11 +3117,9 @@ static void benign_reclaimer_locked( GRPC_HTTP2_ENHANCE_YOUR_CALM), /*immediate_disconnect_hint=*/true); } else if (error.ok() && GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - gpr_log(GPR_INFO, - "HTTP2: %s - skip benign reclamation, there are still %" PRIdPTR - " streams", - std::string(t->peer_string.as_string_view()).c_str(), - t->stream_map.size()); + LOG(INFO) << "HTTP2: " << t->peer_string.as_string_view() + << " - skip benign reclamation, there are still " + << t->stream_map.size() << " streams"; } t->benign_reclaimer_registered = false; if (error != absl::CancelledError()) { @@ -3117,8 +3135,8 @@ static void destructive_reclaimer_locked( // As stream_map is a hash map, this selects effectively a random stream. grpc_chttp2_stream* s = t->stream_map.begin()->second; if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - gpr_log(GPR_INFO, "HTTP2: %s - abandon stream id %d", - std::string(t->peer_string.as_string_view()).c_str(), s->id); + LOG(INFO) << "HTTP2: " << t->peer_string.as_string_view() + << " - abandon stream id " << s->id; } grpc_chttp2_cancel_stream( t.get(), s, @@ -3215,9 +3233,9 @@ grpc_chttp2_transport_get_socket_node(grpc_core::Transport* transport) { } grpc_core::Transport* grpc_create_chttp2_transport( - const grpc_core::ChannelArgs& channel_args, grpc_endpoint* ep, - bool is_client) { - return new grpc_chttp2_transport(channel_args, ep, is_client); + const grpc_core::ChannelArgs& channel_args, + grpc_core::OrphanablePtr ep, bool is_client) { + return new grpc_chttp2_transport(channel_args, std::move(ep), is_client); } void grpc_chttp2_transport_start_reading( @@ -3228,7 +3246,6 @@ void grpc_chttp2_transport_start_reading( auto t = reinterpret_cast(transport)->Ref(); if (read_buffer != nullptr) { grpc_slice_buffer_move_into(read_buffer, &t->read_buffer); - gpr_free(read_buffer); } auto* tp = t.get(); tp->combiner->Run( @@ -3240,7 +3257,7 @@ void grpc_chttp2_transport_start_reading( if (t->ep != nullptr && interested_parties_until_recv_settings != nullptr) { grpc_endpoint_delete_from_pollset_set( - t->ep, interested_parties_until_recv_settings); + t->ep.get(), interested_parties_until_recv_settings); } grpc_core::ExecCtx::Run(DEBUG_LOCATION, notify_on_receive_settings, t->closed_with_error); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index 1bcb8a9ae1..d2b9329803 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -44,8 +44,8 @@ /// from the caller; if the caller still needs the resource_user after creating /// a transport, the caller must take another ref. grpc_core::Transport* grpc_create_chttp2_transport( - const grpc_core::ChannelArgs& channel_args, grpc_endpoint* ep, - bool is_client); + const grpc_core::ChannelArgs& channel_args, + grpc_core::OrphanablePtr ep, bool is_client); grpc_core::RefCountedPtr grpc_chttp2_transport_get_socket_node(grpc_core::Transport* transport); diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index 9e4138ea50..39c0d08299 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -28,11 +28,11 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" -#include #include #include "src/core/ext/transport/chttp2/transport/http2_settings.h" @@ -234,8 +234,8 @@ void TransportFlowControl::UpdateSetting( uint32_t)) { if (new_desired_value != *desired_value) { if (GRPC_TRACE_FLAG_ENABLED(flowctl)) { - gpr_log(GPR_INFO, "[flowctl] UPDATE SETTING %s from %" PRId64 " to %d", - std::string(name).c_str(), *desired_value, new_desired_value); + LOG(INFO) << "[flowctl] UPDATE SETTING " << name << " from " + << *desired_value << " to " << new_desired_value; } // Reaching zero can only happen for initial window size, and if it occurs // we really want to wake up writes and ensure all the queued stream diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index 3476ab1248..e16965c447 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -55,7 +55,7 @@ absl::Status grpc_chttp2_data_parser_begin_frame(uint8_t flags, 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_core::CallTracerInterface* call_tracer, grpc_slice_buffer* outbuf) { grpc_slice hdr; uint8_t* p; @@ -77,10 +77,7 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, grpc_slice_buffer_move_first_no_ref(inbuf, write_bytes, outbuf); - stats->framing_bytes += header_size; - if (!grpc_core::IsHttp2StatsFixEnabled()) { - stats->data_bytes += write_bytes; - } + call_tracer->RecordOutgoingBytes({header_size, 0, 0}); } grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( @@ -129,8 +126,7 @@ grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( if (min_progress_size != nullptr) *min_progress_size = 0; if (stream_out != nullptr) { - s->stats.incoming.framing_bytes += 5; - s->stats.incoming.data_bytes += length; + s->call_tracer_wrapper.RecordIncomingBytes({5, length, 0}); grpc_slice_buffer_move_first_into_buffer(slices, 5, header); grpc_slice_buffer_move_first(slices, length, stream_out->c_slice_buffer()); } diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h index 1e628d48dd..eae1f439c3 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/src/core/ext/transport/chttp2/transport/frame_data.h @@ -33,6 +33,7 @@ #include "src/core/lib/promise/poll.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" // start processing a new data frame absl::Status grpc_chttp2_data_parser_begin_frame(uint8_t flags, @@ -49,7 +50,7 @@ grpc_error_handle grpc_chttp2_data_parser_parse(void* parser, 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_core::CallTracerInterface* call_tracer, grpc_slice_buffer* outbuf); grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc index 9a455c0baf..764f9842cf 100644 --- a/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -25,11 +25,11 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -94,8 +94,8 @@ grpc_error_handle grpc_chttp2_ping_parser_parse(void* parser, CHECK(is_last); if (p->is_ack) { if (GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log(GPR_INFO, "%s[%p]: received ping ack %" PRIx64, - t->is_client ? "CLIENT" : "SERVER", t, p->opaque_8bytes); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: received ping ack " << p->opaque_8bytes; } grpc_chttp2_ack_ping(t, p->opaque_8bytes); } else { @@ -104,16 +104,15 @@ grpc_error_handle grpc_chttp2_ping_parser_parse(void* parser, t->keepalive_permit_without_calls == 0 && t->stream_map.empty(); if (GRPC_TRACE_FLAG_ENABLED(http_keepalive) || GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "SERVER[%p]: received ping %" PRIx64 ": %s", t, - p->opaque_8bytes, - t->ping_abuse_policy.GetDebugString(transport_idle).c_str()); + LOG(INFO) << "SERVER[" << t << "]: received ping " << p->opaque_8bytes + << ": " + << t->ping_abuse_policy.GetDebugString(transport_idle); } if (t->ping_abuse_policy.ReceivedOnePing(transport_idle)) { grpc_chttp2_exceeded_ping_strikes(t); } } else if (GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log(GPR_INFO, "CLIENT[%p]: received ping %" PRIx64, t, - p->opaque_8bytes); + LOG(INFO) << "CLIENT[" << t << "]: received ping " << p->opaque_8bytes; } if (t->ack_pings) { if (t->ping_ack_count == t->ping_ack_capacity) { diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index dd57065036..540d4faaf2 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -21,13 +21,13 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/random/distributions.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -39,11 +39,13 @@ #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" -grpc_slice grpc_chttp2_rst_stream_create(uint32_t id, uint32_t code, - grpc_transport_one_way_stats* stats) { +grpc_slice grpc_chttp2_rst_stream_create( + uint32_t id, uint32_t code, grpc_core::CallTracerInterface* call_tracer) { static const size_t frame_size = 13; grpc_slice slice = GRPC_SLICE_MALLOC(frame_size); - if (stats != nullptr) stats->framing_bytes += frame_size; + if (call_tracer != nullptr) { + call_tracer->RecordOutgoingBytes({frame_size, 0, 0}); + } uint8_t* p = GRPC_SLICE_START_PTR(slice); // Frame size. @@ -70,10 +72,10 @@ grpc_slice grpc_chttp2_rst_stream_create(uint32_t id, uint32_t code, 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_core::CallTracerInterface* call_tracer) { t->num_pending_induced_frames++; grpc_slice_buffer_add(&t->qbuf, - grpc_chttp2_rst_stream_create(id, code, stats)); + grpc_chttp2_rst_stream_create(id, code, call_tracer)); } grpc_error_handle grpc_chttp2_rst_stream_parser_begin_frame( @@ -102,7 +104,8 @@ grpc_error_handle grpc_chttp2_rst_stream_parser_parse(void* parser, cur++; p->byte++; } - s->stats.incoming.framing_bytes += static_cast(end - cur); + uint64_t framing_bytes = static_cast(end - cur); + s->call_tracer_wrapper.RecordIncomingBytes({framing_bytes, 0, 0}); if (p->byte == 4) { CHECK(is_last); @@ -111,9 +114,8 @@ grpc_error_handle grpc_chttp2_rst_stream_parser_parse(void* parser, ((static_cast(p->reason_bytes[2])) << 8) | ((static_cast(p->reason_bytes[3]))); if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, - "[chttp2 transport=%p stream=%p] received RST_STREAM(reason=%d)", - t, s, reason); + LOG(INFO) << "[chttp2 transport=" << t << " stream=" << s + << "] received RST_STREAM(reason=" << reason << ")"; } grpc_error_handle error; if (reason != GRPC_HTTP2_NO_ERROR || s->trailing_metadata_buffer.empty()) { diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index 1da9c0e457..0e8e74b62a 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -27,20 +27,22 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" struct grpc_chttp2_rst_stream_parser { uint8_t byte; uint8_t reason_bytes[4]; }; -grpc_slice grpc_chttp2_rst_stream_create(uint32_t stream_id, uint32_t code, - grpc_transport_one_way_stats* stats); +grpc_slice grpc_chttp2_rst_stream_create( + uint32_t stream_id, uint32_t code, + grpc_core::CallTracerInterface* call_tracer); // Adds RST_STREAM frame to t->qbuf (buffer for the next write). Should be // called when we want to add RST_STREAM and we are not in // write_action_begin_locked. 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_core::CallTracerInterface* call_tracer); grpc_error_handle grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_rst_stream_parser* parser, uint32_t length, uint8_t flags); diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index bea244c818..ebf74b2114 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -23,11 +23,11 @@ #include #include "absl/base/attributes.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/flow_control.h" @@ -110,7 +110,7 @@ grpc_error_handle grpc_chttp2_settings_parser_parse(void* p, if (t->notify_on_receive_settings != nullptr) { if (t->interested_parties_until_recv_settings != nullptr) { grpc_endpoint_delete_from_pollset_set( - t->ep, t->interested_parties_until_recv_settings); + t->ep.get(), t->interested_parties_until_recv_settings); t->interested_parties_until_recv_settings = nullptr; } grpc_core::ExecCtx::Run(DEBUG_LOCATION, @@ -172,9 +172,9 @@ grpc_error_handle grpc_chttp2_settings_parser_parse(void* p, parser->incoming_settings->initial_window_size(); if (GRPC_TRACE_FLAG_ENABLED(http) || GRPC_TRACE_FLAG_ENABLED(flowctl)) { - gpr_log(GPR_INFO, "%p[%s] adding %d for initial_window change", t, - t->is_client ? "cli" : "svr", - static_cast(t->initial_window_update)); + LOG(INFO) << t << "[" << (t->is_client ? "cli" : "svr") + << "] adding " << t->initial_window_update + << " for initial_window change"; } } auto error = @@ -188,11 +188,10 @@ grpc_error_handle grpc_chttp2_settings_parser_parse(void* p, grpc_core::Http2Settings::WireIdToName(parser->id).c_str())); } if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "CHTTP2:%s:%s: got setting %s = %d", - t->is_client ? "CLI" : "SVR", - std::string(t->peer_string.as_string_view()).c_str(), - grpc_core::Http2Settings::WireIdToName(parser->id).c_str(), - parser->value); + LOG(INFO) << "CHTTP2:" << (t->is_client ? "CLI" : "SVR") << ":" + << t->peer_string.as_string_view() << ": got setting " + << grpc_core::Http2Settings::WireIdToName(parser->id) + << " = " << parser->value; } } break; } diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc index f9824f7e03..efae1615eb 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -32,10 +32,13 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" grpc_slice grpc_chttp2_window_update_create( - uint32_t id, uint32_t window_delta, grpc_transport_one_way_stats* stats) { + uint32_t id, uint32_t window_delta, + grpc_core::CallTracerInterface* call_tracer) { static const size_t frame_size = 13; grpc_slice slice = GRPC_SLICE_MALLOC(frame_size); - stats->framing_bytes += frame_size; + if (call_tracer != nullptr) { + call_tracer->RecordOutgoingBytes({frame_size, 0, 0}); + } uint8_t* p = GRPC_SLICE_START_PTR(slice); CHECK(window_delta); @@ -84,7 +87,8 @@ grpc_error_handle grpc_chttp2_window_update_parser_parse( } if (s != nullptr) { - s->stats.incoming.framing_bytes += static_cast(end - cur); + uint64_t framing_bytes = static_cast(end - cur); + s->call_tracer_wrapper.RecordIncomingBytes({framing_bytes, 0, 0}); } if (p->byte == 4) { diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h index 92ea158701..53c5f41d3d 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -27,6 +27,7 @@ #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" struct grpc_chttp2_window_update_parser { uint8_t byte; @@ -34,7 +35,8 @@ struct grpc_chttp2_window_update_parser { uint32_t amount; }; grpc_slice grpc_chttp2_window_update_create( - uint32_t id, uint32_t window_delta, grpc_transport_one_way_stats* stats); + uint32_t id, uint32_t window_delta, + grpc_core::CallTracerInterface* call_tracer); grpc_error_handle grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_window_update_parser* parser, uint32_t length, uint8_t flags); diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 2ca62cd207..54a0865869 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -22,10 +22,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include -#include #include #include "src/core/ext/transport/chttp2/transport/bin_encoder.h" @@ -87,7 +87,7 @@ void HPackCompressor::Frame(const EncodeHeaderOptions& options, if (options.is_end_of_stream) { flags |= GRPC_CHTTP2_DATA_FLAG_END_STREAM; } - options.stats->header_bytes += raw.Length(); + options.call_tracer->RecordOutgoingBytes({0, 0, raw.Length()}); while (frame_type == GRPC_CHTTP2_FRAME_HEADER || raw.Length() > 0) { // per the HTTP/2 spec: // A HEADERS frame without the END_HEADERS flag set MUST be followed by @@ -101,7 +101,7 @@ void HPackCompressor::Frame(const EncodeHeaderOptions& options, } FillHeader(grpc_slice_buffer_tiny_add(output, kHeadersFrameHeaderSize), frame_type, options.stream_id, len, flags); - options.stats->framing_bytes += kHeadersFrameHeaderSize; + options.call_tracer->RecordOutgoingBytes({kHeadersFrameHeaderSize, 0, 0}); grpc_slice_buffer_move_first(raw.c_slice_buffer(), len, output); frame_type = GRPC_CHTTP2_FRAME_CONTINUATION; @@ -118,8 +118,7 @@ void HPackCompressor::SetMaxTableSize(uint32_t max_table_size) { if (table_.SetMaxSize(std::min(max_usable_size_, max_table_size))) { advertise_table_size_change_ = true; if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "set max table size from encoder to %d", - max_table_size); + LOG(INFO) << "set max table size from encoder to " << max_table_size; } } } diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index b3db3db70b..cfbf2426ec 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -25,12 +25,12 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" @@ -42,6 +42,7 @@ #include "src/core/lib/transport/metadata_compression_traits.h" #include "src/core/lib/transport/timeout_encoding.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_core { @@ -208,9 +209,7 @@ class Compressor< void EncodeWith(MetadataTrait, const typename MetadataTrait::ValueType& value, Encoder* encoder) { if (value != known_value) { - gpr_log(GPR_ERROR, "%s", - absl::StrCat("Not encoding bad ", MetadataTrait::key(), " header") - .c_str()); + LOG(ERROR) << "Not encoding bad " << MetadataTrait::key() << " header"; encoder->NoteEncodingError(); return; } @@ -355,7 +354,7 @@ class HPackCompressor { bool is_end_of_stream; bool use_true_binary_metadata; size_t max_frame_size; - grpc_transport_one_way_stats* stats; + CallTracerInterface* call_tracer; }; template diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 84b4e86279..ba6031b89c 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -28,6 +28,7 @@ #include "absl/base/attributes.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -37,7 +38,6 @@ #include "absl/types/variant.h" #include -#include #include #include "src/core/ext/transport/chttp2/transport/decode_huff.h" @@ -700,14 +700,14 @@ class HPackParser::Parser { type = "???"; break; } - gpr_log( - GPR_DEBUG, "HTTP:%d:%s:%s: %s%s", log_info_.stream_id, type, - log_info_.is_client ? "CLI" : "SVR", memento.md.DebugString().c_str(), - memento.parse_status == nullptr - ? "" - : absl::StrCat(" (parse error: ", - memento.parse_status->Materialize().ToString(), ")") - .c_str()); + VLOG(2) << "HTTP:" << log_info_.stream_id << ":" << type << ":" + << (log_info_.is_client ? "CLI" : "SVR") << ": " + << memento.md.DebugString() + << (memento.parse_status == nullptr + ? "" + : absl::StrCat( + " (parse error: ", + memento.parse_status->Materialize().ToString(), ")")); } void EmitHeader(const HPackTable::Memento& md) { @@ -995,9 +995,8 @@ class HPackParser::Parser { if (!status.ok()) return; input_->SetErrorAndContinueParsing( HpackParseResult::MetadataParseError(key_string)); - gpr_log(GPR_ERROR, "Error parsing '%s' metadata: %s", - std::string(key_string).c_str(), - std::string(message).c_str()); + LOG(ERROR) << "Error parsing '" << key_string + << "' metadata: " << message; }); HPackTable::Memento memento{std::move(md), status.PersistentStreamErrorOrNullptr()}; diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 6e077a835e..ae306c925d 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -226,7 +226,8 @@ typedef enum { struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, public grpc_core::KeepsGrpcInitialized { grpc_chttp2_transport(const grpc_core::ChannelArgs& channel_args, - grpc_endpoint* ep, bool is_client); + grpc_core::OrphanablePtr endpoint, + bool is_client); ~grpc_chttp2_transport() override; void Orphan() override; @@ -257,7 +258,7 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, grpc_pollset_set* pollset_set) override; void PerformOp(grpc_transport_op* op) override; - grpc_endpoint* ep; + grpc_core::OrphanablePtr ep; grpc_core::Mutex ep_destroy_mu; // Guards endpoint destruction only. grpc_core::Slice peer_string; @@ -553,6 +554,51 @@ typedef enum { GRPC_METADATA_PUBLISHED_AT_CLOSE } grpc_published_metadata_method; +namespace grpc_core { + +// A CallTracer wrapper that updates both the legacy and new APIs for +// transport byte sizes. +// TODO(ctiller): This can go away as part of removing the +// grpc_transport_stream_stats struct. +class Chttp2CallTracerWrapper final : public CallTracerInterface { + public: + explicit Chttp2CallTracerWrapper(grpc_chttp2_stream* stream) + : stream_(stream) {} + + void RecordIncomingBytes( + const TransportByteSize& transport_byte_size) override; + void RecordOutgoingBytes( + const TransportByteSize& transport_byte_size) override; + + // Everything else is a no-op. + void RecordSendInitialMetadata( + grpc_metadata_batch* /*send_initial_metadata*/) override {} + void RecordSendTrailingMetadata( + grpc_metadata_batch* /*send_trailing_metadata*/) override {} + void RecordSendMessage(const SliceBuffer& /*send_message*/) override {} + void RecordSendCompressedMessage( + const SliceBuffer& /*send_compressed_message*/) override {} + void RecordReceivedInitialMetadata( + grpc_metadata_batch* /*recv_initial_metadata*/) override {} + void RecordReceivedMessage(const SliceBuffer& /*recv_message*/) override {} + void RecordReceivedDecompressedMessage( + const SliceBuffer& /*recv_decompressed_message*/) override {} + void RecordCancel(grpc_error_handle /*cancel_error*/) override {} + std::shared_ptr StartNewTcpTrace() override { + return nullptr; + } + void RecordAnnotation(absl::string_view /*annotation*/) override {} + void RecordAnnotation(const Annotation& /*annotation*/) override {} + std::string TraceId() override { return ""; } + std::string SpanId() override { return ""; } + bool IsSampled() override { return false; } + + private: + grpc_chttp2_stream* stream_; +}; + +} // namespace grpc_core + struct grpc_chttp2_stream { grpc_chttp2_stream(grpc_chttp2_transport* t, grpc_stream_refcount* refcount, const void* server_data, grpc_core::Arena* arena); @@ -652,7 +698,11 @@ struct grpc_chttp2_stream { /// Number of times written int64_t write_counter = 0; + grpc_core::Chttp2CallTracerWrapper call_tracer_wrapper; + /// Only set when enabled. + // TODO(roth): Remove this when the call_tracer_in_transport + // experiment finishes rolling out. grpc_core::CallTracerAnnotationInterface* call_tracer = nullptr; /// Only set when enabled. @@ -807,13 +857,8 @@ void grpc_chttp2_settings_timeout( #define GRPC_CHTTP2_CLIENT_CONNECT_STRLEN \ (sizeof(GRPC_CHTTP2_CLIENT_CONNECT_STRING) - 1) -// -#define GRPC_CHTTP2_IF_TRACING(stmt) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(http)) { \ - (stmt); \ - } \ - } while (0) +#define GRPC_CHTTP2_IF_TRACING(severity) \ + LOG_IF(severity, GRPC_TRACE_FLAG_ENABLED(http)) void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* stream, diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index e0a8297b31..82c5a188b4 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -40,7 +40,6 @@ #include #include #include -#include #include #include "src/core/channelz/channelz.h" @@ -332,10 +331,11 @@ absl::variant grpc_chttp2_perform_read( DCHECK_LT(cur, end); t->incoming_stream_id |= (static_cast(*cur)); if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_INFO, "INCOMING[%p]: %s len:%d id:0x%08x", t, - FrameTypeString(t->incoming_frame_type, t->incoming_frame_flags) - .c_str(), - t->incoming_frame_size, t->incoming_stream_id); + LOG(INFO) << "INCOMING[" << t << "]: " + << FrameTypeString(t->incoming_frame_type, + t->incoming_frame_flags) + << " len:" << t->incoming_frame_size + << absl::StrFormat(" id:0x%08x", t->incoming_stream_id); } t->deframe_state = GRPC_DTS_FRAME; err = init_frame_parser(t, requests_started); @@ -453,7 +453,8 @@ static grpc_error_handle init_frame_parser(grpc_chttp2_transport* t, return init_goaway_parser(t); default: if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_ERROR, "Unknown frame type %02x", t->incoming_frame_type); + LOG(ERROR) << "Unknown frame type " + << absl::StrFormat("%02x", t->incoming_frame_type); } return init_non_header_skip_frame_parser(t); } @@ -554,7 +555,7 @@ static grpc_error_handle init_data_frame_parser(grpc_chttp2_transport* t) { return init_non_header_skip_frame_parser(t); } s->received_bytes += t->incoming_frame_size; - s->stats.incoming.framing_bytes += 9; + s->call_tracer_wrapper.RecordIncomingBytes({9, 0, 0}); if (s->read_closed) { return init_non_header_skip_frame_parser(t); } @@ -573,7 +574,7 @@ static grpc_error_handle init_data_frame_parser(grpc_chttp2_transport* t) { absl_status_to_grpc_error(status)); grpc_chttp2_add_rst_stream_to_next_write(t, t->incoming_stream_id, GRPC_HTTP2_PROTOCOL_ERROR, - &s->stats.outgoing); + &s->call_tracer_wrapper); return init_non_header_skip_frame_parser(t); } else { return absl_status_to_grpc_error(status); @@ -611,9 +612,8 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, s = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (s == nullptr) { if (GPR_UNLIKELY(is_continuation)) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_ERROR, - "grpc_chttp2_stream disbanded before CONTINUATION received")); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "grpc_chttp2_stream disbanded before CONTINUATION received"; return init_header_skip_frame_parser(t, priority_type, is_eoh); } if (t->is_client) { @@ -621,23 +621,21 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, t->incoming_stream_id < t->next_stream_id)) { // this is an old (probably cancelled) grpc_chttp2_stream } else { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client")); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "ignoring new grpc_chttp2_stream creation on client"; } return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (GPR_UNLIKELY(t->last_new_stream_id >= t->incoming_stream_id)) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, - "ignoring out of order new grpc_chttp2_stream request on server; " - "last grpc_chttp2_stream " - "id=%d, new grpc_chttp2_stream id=%d", - t->last_new_stream_id, t->incoming_stream_id)); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "ignoring out of order new grpc_chttp2_stream request on server; " + "last grpc_chttp2_stream id=" + << t->last_new_stream_id + << ", new grpc_chttp2_stream id=" << t->incoming_stream_id; return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (GPR_UNLIKELY((t->incoming_stream_id & 1) == 0)) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, - "ignoring grpc_chttp2_stream with non-client generated index %d", - t->incoming_stream_id)); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "ignoring grpc_chttp2_stream with non-client generated index " + << t->incoming_stream_id; return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (GPR_UNLIKELY(t->stream_map.size() + t->extra_streams >= t->settings.acked().max_concurrent_streams())) { @@ -678,21 +676,22 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, } else if (t->sent_goaway_state == GRPC_CHTTP2_FINAL_GOAWAY_SENT || t->sent_goaway_state == GRPC_CHTTP2_FINAL_GOAWAY_SEND_SCHEDULED) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_INFO, - "transport:%p SERVER peer:%s Final GOAWAY sent. Ignoring new " - "grpc_chttp2_stream request id=%d, last grpc_chttp2_stream id=%d", - t, std::string(t->peer_string.as_string_view()).c_str(), - t->incoming_stream_id, t->last_new_stream_id)); + GRPC_CHTTP2_IF_TRACING(INFO) + << "transport:" << t + << " SERVER peer:" << t->peer_string.as_string_view() + << " Final GOAWAY sent. Ignoring new grpc_chttp2_stream request " + "id=" + << t->incoming_stream_id + << ", last grpc_chttp2_stream id=" << t->last_new_stream_id; + ; return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (t->num_incoming_streams_before_settings_ack == 0) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, - "transport:%p SERVER peer:%s rejecting grpc_chttp2_stream id=%d, " - "last grpc_chttp2_stream id=%d before settings have been " - "acknowledged", - t, std::string(t->peer_string.as_string_view()).c_str(), - t->incoming_stream_id, t->last_new_stream_id)); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "transport:" << t + << " SERVER peer:" << t->peer_string.as_string_view() + << " rejecting grpc_chttp2_stream id=" << t->incoming_stream_id + << ", last grpc_chttp2_stream id=" << t->last_new_stream_id + << " before settings have been acknowledged"; ++t->num_pending_induced_frames; grpc_slice_buffer_add( &t->qbuf, @@ -708,18 +707,16 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, grpc_chttp2_parsing_accept_stream(t, t->incoming_stream_id); ++requests_started; if (GPR_UNLIKELY(s == nullptr)) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_ERROR, "grpc_chttp2_stream not accepted")); + GRPC_CHTTP2_IF_TRACING(ERROR) << "grpc_chttp2_stream not accepted"; return init_header_skip_frame_parser(t, priority_type, is_eoh); } if (GRPC_TRACE_FLAG_ENABLED(http) || GRPC_TRACE_FLAG_ENABLED(chttp2_new_stream)) { - gpr_log(GPR_INFO, - "[t:%p fd:%d peer:%s] Accepting new stream; " - "num_incoming_streams_before_settings_ack=%u", - t, grpc_endpoint_get_fd(t->ep), - std::string(t->peer_string.as_string_view()).c_str(), - t->num_incoming_streams_before_settings_ack); + LOG(INFO) << "[t:" << t << " fd:" << grpc_endpoint_get_fd(t->ep.get()) + << " peer:" << t->peer_string.as_string_view() + << "] Accepting new stream; " + "num_incoming_streams_before_settings_ack=" + << t->num_incoming_streams_before_settings_ack; } if (t->channelz_socket != nullptr) { t->channelz_socket->RecordStreamStartedFromRemote(); @@ -728,10 +725,10 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, t->incoming_stream = s; } DCHECK_NE(s, nullptr); - s->stats.incoming.framing_bytes += 9; + s->call_tracer_wrapper.RecordIncomingBytes({9, 0, 0}); if (GPR_UNLIKELY(s->read_closed)) { - GRPC_CHTTP2_IF_TRACING(gpr_log( - GPR_ERROR, "skipping already closed grpc_chttp2_stream header")); + GRPC_CHTTP2_IF_TRACING(ERROR) + << "skipping already closed grpc_chttp2_stream header"; t->incoming_stream = nullptr; return init_header_skip_frame_parser(t, priority_type, is_eoh); } @@ -745,7 +742,7 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, switch (s->header_frames_received) { case 0: if (t->is_client && t->header_eof) { - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "parsing Trailers-Only")); + GRPC_CHTTP2_IF_TRACING(INFO) << "parsing Trailers-Only"; if (s->trailing_metadata_available != nullptr) { *s->trailing_metadata_available = true; } @@ -755,13 +752,13 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, incoming_metadata_buffer = &s->trailing_metadata_buffer; frame_type = HPackParser::LogInfo::kTrailers; } else { - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "parsing initial_metadata")); + GRPC_CHTTP2_IF_TRACING(INFO) << "parsing initial_metadata"; incoming_metadata_buffer = &s->initial_metadata_buffer; frame_type = HPackParser::LogInfo::kHeaders; } break; case 1: - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "parsing trailing_metadata")); + GRPC_CHTTP2_IF_TRACING(INFO) << "parsing trailing_metadata"; incoming_metadata_buffer = &s->trailing_metadata_buffer; frame_type = HPackParser::LogInfo::kTrailers; break; @@ -794,12 +791,12 @@ static grpc_error_handle init_window_update_frame_parser( grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); if (s == nullptr) { if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_ERROR, "Stream %d not found, ignoring WINDOW_UPDATE", - t->incoming_stream_id); + LOG(ERROR) << "Stream " << t->incoming_stream_id + << " not found, ignoring WINDOW_UPDATE"; } return init_non_header_skip_frame_parser(t); } - s->stats.incoming.framing_bytes += 9; + s->call_tracer_wrapper.RecordIncomingBytes({9, 0, 0}); } t->parser = grpc_chttp2_transport::Parser{ "window_update", grpc_chttp2_window_update_parser_parse, @@ -825,7 +822,7 @@ static grpc_error_handle init_rst_stream_parser(grpc_chttp2_transport* t) { if (!t->incoming_stream) { return init_non_header_skip_frame_parser(t); } - s->stats.incoming.framing_bytes += 9; + s->call_tracer_wrapper.RecordIncomingBytes({9, 0, 0}); t->parser = grpc_chttp2_transport::Parser{ "rst_stream", grpc_chttp2_rst_stream_parser_parse, &t->simple.rst_stream}; if (!t->is_client && grpc_core::IsRstpitEnabled()) { @@ -896,8 +893,8 @@ static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, return err; } if (GRPC_TRACE_FLAG_ENABLED(http)) { - gpr_log(GPR_ERROR, "INCOMING[%p;%p]: Parse failed with %s", t, s, - err.ToString().c_str()); + LOG(ERROR) << "INCOMING[" << t << ";" << s << "]: Parse failed with " + << err; } if (grpc_error_get_int(err, grpc_core::StatusIntProperty::kStreamId, &unused)) { @@ -921,7 +918,7 @@ static void force_client_rst_stream(void* sp, grpc_error_handle /*error*/) { grpc_chttp2_transport* t = s->t.get(); if (!s->write_closed) { grpc_chttp2_add_rst_stream_to_next_write(t, s->id, GRPC_HTTP2_NO_ERROR, - &s->stats.outgoing); + &s->call_tracer_wrapper); grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_FORCE_RST_STREAM); grpc_chttp2_mark_stream_closed(t, s, true, true, absl::OkStatus()); } @@ -936,9 +933,12 @@ grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser, auto* parser = static_cast(hpack_parser); grpc_core::CallTracerAnnotationInterface* call_tracer = nullptr; if (s != nullptr) { - s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice); + s->call_tracer_wrapper.RecordIncomingBytes( + {0, 0, GRPC_SLICE_LENGTH(slice)}); call_tracer = - s->arena->GetContext(); + grpc_core::IsCallTracerInTransportEnabled() + ? s->arena->GetContext() + : s->arena->GetContext(); } grpc_error_handle error = parser->Parse( slice, is_last != 0, absl::BitGenRef(t->bitgen), call_tracer); diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc index 22918442b7..2466f95026 100644 --- a/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -17,8 +17,8 @@ // #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -69,8 +69,8 @@ static bool stream_list_pop(grpc_chttp2_transport* t, } *stream = s; if (s && GRPC_TRACE_FLAG_ENABLED(http2_stream_state)) { - gpr_log(GPR_INFO, "%p[%d][%s]: pop from %s", t, s->id, - t->is_client ? "cli" : "svr", stream_list_id_string(id)); + LOG(INFO) << t << "[" << s->id << "][" << (t->is_client ? "cli" : "svr") + << "]: pop from " << stream_list_id_string(id); } return s != nullptr; } @@ -91,8 +91,8 @@ static void stream_list_remove(grpc_chttp2_transport* t, grpc_chttp2_stream* s, t->lists[id].tail = s->links[id].prev; } if (GRPC_TRACE_FLAG_ENABLED(http2_stream_state)) { - gpr_log(GPR_INFO, "%p[%d][%s]: remove from %s", t, s->id, - t->is_client ? "cli" : "svr", stream_list_id_string(id)); + LOG(INFO) << t << "[" << s->id << "][" << (t->is_client ? "cli" : "svr") + << "]: remove from " << stream_list_id_string(id); } } @@ -123,8 +123,8 @@ static void stream_list_add_tail(grpc_chttp2_transport* t, t->lists[id].tail = s; s->included.set(id); if (GRPC_TRACE_FLAG_ENABLED(http2_stream_state)) { - gpr_log(GPR_INFO, "%p[%d][%s]: add to %s", t, s->id, - t->is_client ? "cli" : "svr", stream_list_id_string(id)); + LOG(INFO) << t << "[" << s->id << "][" << (t->is_client ? "cli" : "svr") + << "]: add to " << stream_list_id_string(id); } } diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 7112e1ffbf..2f423069b6 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -27,12 +27,12 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/types/optional.h" #include #include -#include #include #include @@ -136,10 +136,10 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { GRPC_TRACE_FLAG_ENABLED(bdp_estimator) || GRPC_TRACE_FLAG_ENABLED(http_keepalive) || GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log(GPR_INFO, "%s[%p]: Ping %" PRIx64 " sent [%s]: %s", - t->is_client ? "CLIENT" : "SERVER", t, id, - std::string(t->peer_string.as_string_view()).c_str(), - t->ping_rate_policy.GetDebugString().c_str()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Ping " << id << " sent [" + << std::string(t->peer_string.as_string_view()) + << "]: " << t->ping_rate_policy.GetDebugString(); } }, [t](grpc_core::Chttp2PingRatePolicy::TooManyRecentPings) { @@ -148,11 +148,11 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { GRPC_TRACE_FLAG_ENABLED(bdp_estimator) || GRPC_TRACE_FLAG_ENABLED(http_keepalive) || GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log(GPR_INFO, - "%s[%p]: Ping delayed [%s]: too many recent pings: %s", - t->is_client ? "CLIENT" : "SERVER", t, - std::string(t->peer_string.as_string_view()).c_str(), - t->ping_rate_policy.GetDebugString().c_str()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Ping delayed [" + << std::string(t->peer_string.as_string_view()) + << "]: too many recent pings: " + << t->ping_rate_policy.GetDebugString(); } }, [t](grpc_core::Chttp2PingRatePolicy::TooSoon too_soon) { @@ -161,15 +161,14 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { GRPC_TRACE_FLAG_ENABLED(bdp_estimator) || GRPC_TRACE_FLAG_ENABLED(http_keepalive) || GRPC_TRACE_FLAG_ENABLED(http2_ping)) { - gpr_log( - GPR_INFO, - "%s[%p]: Ping delayed [%s]: not enough time elapsed since last " - "ping. Last ping:%s, minimum wait:%s need to wait:%s", - t->is_client ? "CLIENT" : "SERVER", t, - std::string(t->peer_string.as_string_view()).c_str(), - too_soon.last_ping.ToString().c_str(), - too_soon.next_allowed_ping_interval.ToString().c_str(), - too_soon.wait.ToString().c_str()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Ping delayed [" + << std::string(t->peer_string.as_string_view()) + << "]: not enough time elapsed since last " + "ping. Last ping:" + << too_soon.last_ping + << ", minimum wait:" << too_soon.next_allowed_ping_interval + << ", need to wait:" << too_soon.wait; } if (t->delayed_ping_timer_handle == grpc_event_engine::experimental::EventEngine::TaskHandle:: @@ -207,22 +206,22 @@ static bool update_list(grpc_chttp2_transport* t, int64_t send_bytes, static void report_stall(grpc_chttp2_transport* t, grpc_chttp2_stream* s, const char* staller) { if (GRPC_TRACE_FLAG_ENABLED(flowctl)) { - gpr_log( - GPR_DEBUG, - "%s:%p stream %d moved to stalled list by %s. This is FULLY expected " - "to happen in a healthy program that is not seeing flow control stalls." - " However, if you know that there are unwanted stalls, here is some " - "helpful data: [fc:pending=%" PRIdPTR ":flowed=%" PRId64 - ":peer_initwin=%d:t_win=%" PRId64 ":s_win=%d:s_delta=%" PRId64 "]", - std::string(t->peer_string.as_string_view()).c_str(), t, s->id, staller, - s->flow_controlled_buffer.length, s->flow_controlled_bytes_flowed, - t->settings.acked().initial_window_size(), - t->flow_control.remote_window(), - static_cast(std::max( - int64_t{0}, s->flow_control.remote_window_delta() + - static_cast( - t->settings.peer().initial_window_size()))), - s->flow_control.remote_window_delta()); + VLOG(2) << t->peer_string.as_string_view() << ":" << t << " stream " + << s->id << " moved to stalled list by " << staller + << ". This is FULLY expected to happen in a healthy program that " + "is not seeing flow control stalls. However, if you know that " + "there are unwanted stalls, here is some helpful data: " + "[fc:pending=" + << s->flow_controlled_buffer.length + << ":flowed=" << s->flow_controlled_bytes_flowed + << ":peer_initwin=" << t->settings.acked().initial_window_size() + << ":t_win=" << t->flow_control.remote_window() << ":s_win=" + << static_cast( + std::max(int64_t{0}, + s->flow_control.remote_window_delta() + + static_cast( + t->settings.peer().initial_window_size()))) + << ":s_delta=" << s->flow_control.remote_window_delta() << "]"; } } @@ -297,10 +296,9 @@ class WriteContext { uint32_t transport_announce = t_->flow_control.MaybeSendUpdate( t_->outbuf.c_slice_buffer()->count > 0); if (transport_announce) { - grpc_transport_one_way_stats throwaway_stats; - grpc_slice_buffer_add(t_->outbuf.c_slice_buffer(), - grpc_chttp2_window_update_create( - 0, transport_announce, &throwaway_stats)); + grpc_slice_buffer_add( + t_->outbuf.c_slice_buffer(), + grpc_chttp2_window_update_create(0, transport_announce, nullptr)); grpc_chttp2_reset_ping_clock(t_); } } @@ -412,7 +410,7 @@ class DataSendContext { s_->send_trailing_metadata != nullptr && s_->send_trailing_metadata->empty(); grpc_chttp2_encode_data(s_->id, &s_->flow_controlled_buffer, send_bytes, - is_last_frame_, &s_->stats.outgoing, + is_last_frame_, &s_->call_tracer_wrapper, t_->outbuf.c_slice_buffer()); sfc_upd_.SentData(send_bytes); s_->sending_bytes += send_bytes; @@ -443,10 +441,10 @@ class StreamWriteContext { public: StreamWriteContext(WriteContext* write_context, grpc_chttp2_stream* s) : write_context_(write_context), t_(write_context->transport()), s_(s) { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, "W:%p %s[%d] im-(sent,send)=(%d,%d)", t_, - t_->is_client ? "CLIENT" : "SERVER", s->id, - s->sent_initial_metadata, s->send_initial_metadata != nullptr)); + GRPC_CHTTP2_IF_TRACING(INFO) + << "W:" << t_ << " " << (t_->is_client ? "CLIENT" : "SERVER") << "[" + << s->id << "] im-(sent,send)=(" << s->sent_initial_metadata << "," + << (s->send_initial_metadata != nullptr) << ")"; } void FlushInitialMetadata() { @@ -471,8 +469,7 @@ class StreamWriteContext { t_->settings.peer() .allow_true_binary_metadata(), // use_true_binary_metadata t_->settings.peer().max_frame_size(), // max_frame_size - &s_->stats.outgoing // stats - }, + &s_->call_tracer_wrapper}, *s_->send_initial_metadata, t_->outbuf.c_slice_buffer()); grpc_chttp2_reset_ping_clock(t_); write_context_->IncInitialMetadataWrites(); @@ -484,16 +481,32 @@ class StreamWriteContext { grpc_chttp2_complete_closure_step(t_, &s_->send_initial_metadata_finished, absl::OkStatus(), "send_initial_metadata_finished"); - if (s_->call_tracer) { - grpc_core::HttpAnnotation::WriteStats write_stats; - write_stats.target_write_size = write_context_->target_write_size(); - s_->call_tracer->RecordAnnotation( - grpc_core::HttpAnnotation( - grpc_core::HttpAnnotation::Type::kHeadWritten, - gpr_now(GPR_CLOCK_REALTIME)) - .Add(s_->t->flow_control.stats()) - .Add(s_->flow_control.stats()) - .Add(write_stats)); + if (!grpc_core::IsCallTracerInTransportEnabled()) { + if (s_->call_tracer) { + grpc_core::HttpAnnotation::WriteStats write_stats; + write_stats.target_write_size = write_context_->target_write_size(); + s_->call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation( + grpc_core::HttpAnnotation::Type::kHeadWritten, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s_->t->flow_control.stats()) + .Add(s_->flow_control.stats()) + .Add(write_stats)); + } + } else if (grpc_core::IsTraceRecordCallopsEnabled()) { + auto* call_tracer = + s_->arena->GetContext(); + if (call_tracer != nullptr && call_tracer->IsSampled()) { + grpc_core::HttpAnnotation::WriteStats write_stats; + write_stats.target_write_size = write_context_->target_write_size(); + call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation( + grpc_core::HttpAnnotation::Type::kHeadWritten, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s_->t->flow_control.stats()) + .Add(s_->flow_control.stats()) + .Add(write_stats)); + } } } @@ -504,9 +517,10 @@ class StreamWriteContext { const uint32_t stream_announce = s_->flow_control.MaybeSendUpdate(); if (stream_announce == 0) return; - grpc_slice_buffer_add(t_->outbuf.c_slice_buffer(), - grpc_chttp2_window_update_create( - s_->id, stream_announce, &s_->stats.outgoing)); + grpc_slice_buffer_add( + t_->outbuf.c_slice_buffer(), + grpc_chttp2_window_update_create(s_->id, stream_announce, + &s_->call_tracer_wrapper)); grpc_chttp2_reset_ping_clock(t_); write_context_->IncWindowUpdateWrites(); } @@ -556,15 +570,16 @@ class StreamWriteContext { if (s_->send_trailing_metadata == nullptr) return; if (s_->flow_controlled_buffer.length != 0) return; - GRPC_CHTTP2_IF_TRACING(gpr_log(GPR_INFO, "sending trailing_metadata")); + GRPC_CHTTP2_IF_TRACING(INFO) << "sending trailing_metadata"; if (s_->send_trailing_metadata->empty()) { grpc_chttp2_encode_data(s_->id, &s_->flow_controlled_buffer, 0, true, - &s_->stats.outgoing, t_->outbuf.c_slice_buffer()); + &s_->call_tracer_wrapper, + t_->outbuf.c_slice_buffer()); } else { t_->hpack_compressor.EncodeHeaders( grpc_core::HPackCompressor::EncodeHeaderOptions{ s_->id, true, t_->settings.peer().allow_true_binary_metadata(), - t_->settings.peer().max_frame_size(), &s_->stats.outgoing}, + t_->settings.peer().max_frame_size(), &s_->call_tracer_wrapper}, *s_->send_trailing_metadata, t_->outbuf.c_slice_buffer()); } write_context_->IncTrailingMetadataWrites(); @@ -607,8 +622,8 @@ class StreamWriteContext { }; void ConvertInitialMetadataToTrailingMetadata() { - GRPC_CHTTP2_IF_TRACING( - gpr_log(GPR_INFO, "not sending initial_metadata (Trailers-Only)")); + GRPC_CHTTP2_IF_TRACING(INFO) + << "not sending initial_metadata (Trailers-Only)"; // When sending Trailers-Only, we need to move metadata from headers to // trailers. TrailersOnlyMetadataEncoder encoder(s_->send_trailing_metadata); @@ -628,16 +643,28 @@ class StreamWriteContext { grpc_slice_buffer_add( t_->outbuf.c_slice_buffer(), grpc_chttp2_rst_stream_create(s_->id, GRPC_HTTP2_NO_ERROR, - &s_->stats.outgoing)); + &s_->call_tracer_wrapper)); } grpc_chttp2_mark_stream_closed(t_, s_, !t_->is_client, true, absl::OkStatus()); - if (s_->call_tracer) { - s_->call_tracer->RecordAnnotation( - grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kEnd, - gpr_now(GPR_CLOCK_REALTIME)) - .Add(s_->t->flow_control.stats()) - .Add(s_->flow_control.stats())); + if (!grpc_core::IsCallTracerInTransportEnabled()) { + if (s_->call_tracer) { + s_->call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kEnd, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s_->t->flow_control.stats()) + .Add(s_->flow_control.stats())); + } + } else if (grpc_core::IsTraceRecordCallopsEnabled()) { + auto* call_tracer = + s_->arena->GetContext(); + if (call_tracer != nullptr && call_tracer->IsSampled()) { + call_tracer->RecordAnnotation( + grpc_core::HttpAnnotation(grpc_core::HttpAnnotation::Type::kEnd, + gpr_now(GPR_CLOCK_REALTIME)) + .Add(s_->t->flow_control.stats()) + .Add(s_->flow_control.stats())); + } } } @@ -676,7 +703,7 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write( num_stream_bytes = t->outbuf.c_slice_buffer()->length - orig_len; s->byte_counter += static_cast(num_stream_bytes); ++s->write_counter; - if (s->traced && grpc_endpoint_can_track_err(t->ep)) { + if (s->traced && grpc_endpoint_can_track_err(t->ep.get())) { grpc_core::CopyContextFn copy_context_fn = grpc_core::GrpcHttp2GetCopyContextFn(); if (copy_context_fn != nullptr && @@ -728,10 +755,9 @@ void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error) { grpc_chttp2_ping_timeout(t); }); if (GRPC_TRACE_FLAG_ENABLED(http2_ping) && id.has_value()) { - gpr_log(GPR_INFO, - "%s[%p]: Set ping timeout timer of %s for ping id %" PRIx64, - t->is_client ? "CLIENT" : "SERVER", t, timeout.ToString().c_str(), - id.value()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Set ping timeout timer of " << timeout.ToString() + << " for ping id " << id.value(); } if (t->keepalive_incoming_data_wanted && @@ -741,9 +767,9 @@ void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error) { kInvalid) { if (GRPC_TRACE_FLAG_ENABLED(http2_ping) || GRPC_TRACE_FLAG_ENABLED(http_keepalive)) { - gpr_log(GPR_INFO, "%s[%p]: Set keepalive ping timeout timer of %s", - t->is_client ? "CLIENT" : "SERVER", t, - t->keepalive_timeout.ToString().c_str()); + LOG(INFO) << (t->is_client ? "CLIENT" : "SERVER") << "[" << t + << "]: Set keepalive ping timeout timer of " + << t->keepalive_timeout.ToString(); } t->keepalive_ping_timeout_handle = t->event_engine->RunAfter(t->keepalive_timeout, [t = t->Ref()] { diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc index 60e277cb71..d78069c312 100644 --- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc +++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc @@ -18,10 +18,10 @@ #include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h" +#include "absl/log/log.h" #include "absl/status/statusor.h" #include -#include #include #include "src/core/ext/transport/cronet/transport/cronet_transport.h" @@ -38,9 +38,8 @@ GRPCAPI grpc_channel* grpc_cronet_secure_channel_create( void* engine, const char* target, const grpc_channel_args* args, void* reserved) { - gpr_log(GPR_DEBUG, - "grpc_create_cronet_transport: stream_engine = %p, target=%s", engine, - target); + VLOG(2) << "grpc_create_cronet_transport: stream_engine = " << engine + << ", target=" << target; // Disable client authority filter when using Cronet auto channel_args = grpc_core::CoreConfiguration::Get() diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index b5be87ea63..26b0938228 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -27,6 +27,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -39,7 +40,6 @@ #include #include #include -#include #include #include @@ -67,11 +67,6 @@ #define GRPC_HEADER_SIZE_IN_BYTES 5 #define GRPC_FLUSH_READ_SIZE 4096 -#define CRONET_LOG(...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(cronet)) gpr_log(__VA_ARGS__); \ - } while (0) - enum e_op_result { ACTION_TAKEN_WITH_CALLBACK, ACTION_TAKEN_NO_CALLBACK, @@ -327,7 +322,7 @@ static void read_grpc_header(stream_obj* s) { s->state.rs.remaining_bytes = GRPC_HEADER_SIZE_IN_BYTES; s->state.rs.received_bytes = 0; s->state.rs.compressed = false; - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) << "bidirectional_stream_read(" << s->cbs << ")"; bidirectional_stream_read(s->cbs, s->state.rs.read_buffer, s->state.rs.remaining_bytes); } @@ -365,8 +360,8 @@ static void add_to_storage(struct stream_obj* s, if (op->recv_trailing_metadata) { s->state.pending_recv_trailing_metadata = true; } - CRONET_LOG(GPR_DEBUG, "adding new op %p. %d in the queue.", new_op, - storage->num_pending_ops); + GRPC_TRACE_VLOG(cronet, 2) << "adding new op " << new_op << ". " + << storage->num_pending_ops << " in the queue."; gpr_mu_unlock(&s->mu); } @@ -383,19 +378,21 @@ static void remove_from_storage(struct stream_obj* s, s->storage.head = oas->next; delete oas; s->storage.num_pending_ops--; - CRONET_LOG(GPR_DEBUG, "Freed %p. Now %d in the queue", oas, - s->storage.num_pending_ops); + GRPC_TRACE_VLOG(cronet, 2) << "Freed " << oas << ". Now " + << s->storage.num_pending_ops << " in the queue"; } else { for (curr = s->storage.head; curr != nullptr; curr = curr->next) { if (curr->next == oas) { curr->next = oas->next; s->storage.num_pending_ops--; - CRONET_LOG(GPR_DEBUG, "Freed %p. Now %d in the queue", oas, - s->storage.num_pending_ops); + GRPC_TRACE_VLOG(cronet, 2) + << "Freed " << oas << ". Now " << s->storage.num_pending_ops + << " in the queue"; delete oas; break; } else if (GPR_UNLIKELY(curr->next == nullptr)) { - CRONET_LOG(GPR_ERROR, "Reached end of LL and did not find op to free"); + GRPC_TRACE_LOG(cronet, ERROR) + << "Reached end of LL and did not find op to free"; } } } @@ -410,11 +407,12 @@ static void remove_from_storage(struct stream_obj* s, static void execute_from_storage(stream_obj* s) { gpr_mu_lock(&s->mu); for (struct op_and_state* curr = s->storage.head; curr != nullptr;) { - CRONET_LOG(GPR_DEBUG, "calling op at %p. done = %d", curr, curr->done); + GRPC_TRACE_VLOG(cronet, 2) + << "calling op at " << curr << ". done = " << curr->done; CHECK(!curr->done); enum e_op_result result = execute_stream_op(curr); - CRONET_LOG(GPR_DEBUG, "execute_stream_op[%p] returns %s", curr, - op_result_string(result)); + GRPC_TRACE_VLOG(cronet, 2) << "execute_stream_op[" << curr << "] returns " + << op_result_string(result); // if this op is done, then remove it and free memory if (curr->done) { struct op_and_state* next = curr->next; @@ -434,8 +432,8 @@ static void convert_cronet_array_to_metadata( const bidirectional_stream_header_array* header_array, grpc_metadata_batch* mds) { for (size_t i = 0; i < header_array->count; i++) { - CRONET_LOG(GPR_DEBUG, "header key=%s, value=%s", - header_array->headers[i].key, header_array->headers[i].value); + GRPC_TRACE_VLOG(cronet, 2) << "header key=" << header_array->headers[i].key + << ", value=" << header_array->headers[i].value; grpc_slice value; if (absl::EndsWith(header_array->headers[i].key, "-bin")) { value = grpc_slice_from_static_string(header_array->headers[i].value); @@ -446,11 +444,9 @@ static void convert_cronet_array_to_metadata( } mds->Append(header_array->headers[i].key, grpc_core::Slice(value), [&](absl::string_view error, const grpc_core::Slice& value) { - gpr_log(GPR_DEBUG, "Failed to parse metadata: %s", - absl::StrCat("key=", header_array->headers[i].key, - " error=", error, - " value=", value.as_string_view()) - .c_str()); + VLOG(2) << "Failed to parse metadata: key=" + << header_array->headers[i].key << " error=" << error + << " value=" << value.as_string_view(); }); } } @@ -459,7 +455,7 @@ static void convert_cronet_array_to_metadata( // Cronet callback // static void on_failed(bidirectional_stream* stream, int net_error) { - gpr_log(GPR_ERROR, "on_failed(%p, %d)", stream, net_error); + LOG(ERROR) << "on_failed(" << stream << ", " << net_error << ")"; grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; @@ -487,7 +483,7 @@ static void on_failed(bidirectional_stream* stream, int net_error) { // Cronet callback // static void on_canceled(bidirectional_stream* stream) { - CRONET_LOG(GPR_DEBUG, "on_canceled(%p)", stream); + GRPC_TRACE_VLOG(cronet, 2) << "on_canceled(" << stream << ")"; grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; @@ -514,7 +510,7 @@ static void on_canceled(bidirectional_stream* stream) { // Cronet callback // static void on_succeeded(bidirectional_stream* stream) { - CRONET_LOG(GPR_DEBUG, "on_succeeded(%p)", stream); + GRPC_TRACE_VLOG(cronet, 2) << "on_succeeded(" << stream << ")"; grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; @@ -533,7 +529,7 @@ static void on_succeeded(bidirectional_stream* stream) { // Cronet callback // static void on_stream_ready(bidirectional_stream* stream) { - CRONET_LOG(GPR_DEBUG, "W: on_stream_ready(%p)", stream); + GRPC_TRACE_VLOG(cronet, 2) << "W: on_stream_ready(" << stream << ")"; grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; stream_obj* s = static_cast(stream->annotation); @@ -550,7 +546,8 @@ static void on_stream_ready(bidirectional_stream* stream) { // SEND_TRAILING_METADATA ops pending if (t->use_packet_coalescing) { if (s->state.flush_cronet_when_ready) { - CRONET_LOG(GPR_DEBUG, "cronet_bidirectional_stream_flush (%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "cronet_bidirectional_stream_flush (" << s->cbs << ")"; bidirectional_stream_flush(stream); } } @@ -567,8 +564,9 @@ static void on_response_headers_received( const char* negotiated_protocol) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; - CRONET_LOG(GPR_DEBUG, "R: on_response_headers_received(%p, %p, %s)", stream, - headers, negotiated_protocol); + GRPC_TRACE_VLOG(cronet, 2) + << "R: on_response_headers_received(" << stream << ", " << headers << ", " + << negotiated_protocol << ")"; stream_obj* s = static_cast(stream->annotation); // Identify if this is a header or a trailer (in a trailer-only response case) @@ -605,7 +603,8 @@ static void on_write_completed(bidirectional_stream* stream, const char* data) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; stream_obj* s = static_cast(stream->annotation); - CRONET_LOG(GPR_DEBUG, "W: on_write_completed(%p, %s)", stream, data); + GRPC_TRACE_VLOG(cronet, 2) + << "W: on_write_completed(" << stream << ", " << data << ")"; gpr_mu_lock(&s->mu); if (s->state.ws.write_buffer) { gpr_free(s->state.ws.write_buffer); @@ -624,12 +623,12 @@ static void on_read_completed(bidirectional_stream* stream, char* data, grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; stream_obj* s = static_cast(stream->annotation); - CRONET_LOG(GPR_DEBUG, "R: on_read_completed(%p, %p, %d)", stream, data, - count); + GRPC_TRACE_VLOG(cronet, 2) << "R: on_read_completed(" << stream << ", " + << data << ", " << count << ")"; gpr_mu_lock(&s->mu); s->state.state_callback_received[OP_RECV_MESSAGE] = true; if (count > 0 && s->state.flush_read) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) << "bidirectional_stream_read(" << s->cbs << ")"; bidirectional_stream_read(s->cbs, s->state.rs.read_buffer, GRPC_FLUSH_READ_SIZE); gpr_mu_unlock(&s->mu); @@ -637,7 +636,8 @@ static void on_read_completed(bidirectional_stream* stream, char* data, s->state.rs.received_bytes += count; s->state.rs.remaining_bytes -= count; if (s->state.rs.remaining_bytes > 0) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_read(" << s->cbs << ")"; s->state.state_op_done[OP_READ_REQ_MADE] = true; bidirectional_stream_read( s->cbs, s->state.rs.read_buffer + s->state.rs.received_bytes, @@ -663,8 +663,8 @@ static void on_response_trailers_received( const bidirectional_stream_header_array* trailers) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; - CRONET_LOG(GPR_DEBUG, "R: on_response_trailers_received(%p,%p)", stream, - trailers); + GRPC_TRACE_VLOG(cronet, 2) << "R: on_response_trailers_received(" << stream + << ", " << trailers << ")"; stream_obj* s = static_cast(stream->annotation); grpc_cronet_transport* t = s->curr_ct; gpr_mu_lock(&s->mu); @@ -679,11 +679,13 @@ static void on_response_trailers_received( if (!s->state.state_op_done[OP_SEND_TRAILING_METADATA] && !(s->state.state_op_done[OP_CANCEL_ERROR] || s->state.state_callback_received[OP_FAILED])) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, 0)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_write (" << s->cbs << ", 0)"; s->state.state_callback_received[OP_SEND_MESSAGE] = false; bidirectional_stream_write(s->cbs, "", 0, true); if (t->use_packet_coalescing) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_flush (" << s->cbs << ")"; bidirectional_stream_flush(s->cbs); } s->state.state_op_done[OP_SEND_TRAILING_METADATA] = true; @@ -792,7 +794,7 @@ class CronetMetadataEncoder { } else { value = grpc_slice_to_c_string(value_slice.c_slice()); } - CRONET_LOG(GPR_DEBUG, "header %s = %s", key, value); + GRPC_TRACE_VLOG(cronet, 2) << "header " << key << " = " << value; CHECK_LT(count_, capacity_); headers_[count_].key = key; headers_[count_].value = value; @@ -854,34 +856,34 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, stream_state->state_callback_received[OP_FAILED]; if (is_canceled_or_failed) { if (op_id == OP_SEND_INITIAL_METADATA) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_SEND_MESSAGE) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_SEND_TRAILING_METADATA) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_CANCEL_ERROR) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } // already executed if (op_id == OP_RECV_INITIAL_METADATA && stream_state->state_op_done[OP_RECV_INITIAL_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_RECV_MESSAGE && op_state->state_op_done[OP_RECV_MESSAGE]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } if (op_id == OP_RECV_TRAILING_METADATA && stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } // ON_COMPLETE can be processed if one of the following conditions is met: @@ -894,7 +896,7 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, stream_state->state_callback_received[OP_CANCELED] || stream_state->state_callback_received[OP_SUCCEEDED] || !stream_state->state_op_done[OP_SEND_INITIAL_METADATA])) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } } else if (op_id == OP_SEND_INITIAL_METADATA) { @@ -976,7 +978,7 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, if (op_state->state_op_done[OP_ON_COMPLETE]) { // already executed (note we're checking op specific state, not stream // state) - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } // Check if every op that was asked for is done. @@ -986,36 +988,36 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, // there are still recv ops pending. else if (curr_op->send_initial_metadata && !stream_state->state_callback_received[OP_SEND_INITIAL_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->send_message && !op_state->state_op_done[OP_SEND_MESSAGE]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->send_message && !stream_state->state_callback_received[OP_SEND_MESSAGE]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->send_trailing_metadata && !stream_state->state_op_done[OP_SEND_TRAILING_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->recv_initial_metadata && !stream_state->state_op_done[OP_RECV_INITIAL_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->recv_message && !op_state->state_op_done[OP_RECV_MESSAGE]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->cancel_stream && !stream_state->state_callback_received[OP_CANCELED]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } else if (curr_op->recv_trailing_metadata) { // We aren't done with trailing metadata yet if (!stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } // We've asked for actual message in an earlier op, and it hasn't been @@ -1025,7 +1027,7 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, // op has asked), and the read hasn't been delivered. if (!curr_op->recv_message && !stream_state->state_callback_received[OP_SUCCEEDED]) { - CRONET_LOG(GPR_DEBUG, "Because"); + GRPC_TRACE_VLOG(cronet, 2) << "Because"; result = false; } } @@ -1037,357 +1039,445 @@ static bool op_can_be_run(grpc_transport_stream_op_batch* curr_op, result = false; } } - CRONET_LOG(GPR_DEBUG, "op_can_be_run %s : %s", op_id_string(op_id), - result ? "YES" : "NO"); + GRPC_TRACE_VLOG(cronet, 2) << "op_can_be_run " << op_id_string(op_id) << " : " + << (result ? "YES" : "NO"); return result; } -// -// TODO (makdharma): Break down this function in smaller chunks for readability. -// -static enum e_op_result execute_stream_op(struct op_and_state* oas) { +static enum e_op_result execute_stream_op_send_initial_metadata( + struct op_and_state* oas) { grpc_transport_stream_op_batch* stream_op = &oas->op; struct stream_obj* s = oas->s; grpc_cronet_transport* t = s->curr_ct; struct op_state* stream_state = &s->state; - enum e_op_result result = NO_ACTION_POSSIBLE; - if (stream_op->send_initial_metadata && - op_can_be_run(stream_op, s, &oas->state, OP_SEND_INITIAL_METADATA)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_SEND_INITIAL_METADATA", oas); - // Start new cronet stream. It is destroyed in on_succeeded, on_canceled, - // on_failed - CHECK_EQ(s->cbs, nullptr); - CHECK(!stream_state->state_op_done[OP_SEND_INITIAL_METADATA]); - s->cbs = - bidirectional_stream_create(t->engine, s->curr_gs, &cronet_callbacks); - CRONET_LOG(GPR_DEBUG, "%p = bidirectional_stream_create()", s->cbs); - if (t->use_packet_coalescing) { - bidirectional_stream_disable_auto_flush(s->cbs, true); - bidirectional_stream_delay_request_headers_until_flush(s->cbs, true); - } - std::string url; - const char* method = "POST"; - s->header_array.headers = nullptr; - convert_metadata_to_cronet_headers( - stream_op->payload->send_initial_metadata.send_initial_metadata, - t->host, &url, &s->header_array.headers, &s->header_array.count, - &method); - s->header_array.capacity = s->header_array.count; - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_start(%p, %s)", s->cbs, - url.c_str()); - bidirectional_stream_start(s->cbs, url.c_str(), 0, method, &s->header_array, - false); - unsigned int header_index; - for (header_index = 0; header_index < s->header_array.count; - header_index++) { - gpr_free(const_cast(s->header_array.headers[header_index].key)); - gpr_free(const_cast(s->header_array.headers[header_index].value)); - } - stream_state->state_op_done[OP_SEND_INITIAL_METADATA] = true; - if (t->use_packet_coalescing) { - if (!stream_op->send_message && !stream_op->send_trailing_metadata) { - s->state.flush_cronet_when_ready = true; - } + GRPC_TRACE_VLOG(cronet, 2) + << "running: " << oas << " OP_SEND_INITIAL_METADATA"; + // Start new cronet stream. It is destroyed in on_succeeded, on_canceled, + // on_failed + CHECK_EQ(s->cbs, nullptr); + CHECK(!stream_state->state_op_done[OP_SEND_INITIAL_METADATA]); + s->cbs = + bidirectional_stream_create(t->engine, s->curr_gs, &cronet_callbacks); + GRPC_TRACE_VLOG(cronet, 2) << s->cbs << " = bidirectional_stream_create()"; + if (t->use_packet_coalescing) { + bidirectional_stream_disable_auto_flush(s->cbs, true); + bidirectional_stream_delay_request_headers_until_flush(s->cbs, true); + } + std::string url; + const char* method = "POST"; + s->header_array.headers = nullptr; + convert_metadata_to_cronet_headers( + stream_op->payload->send_initial_metadata.send_initial_metadata, t->host, + &url, &s->header_array.headers, &s->header_array.count, &method); + s->header_array.capacity = s->header_array.count; + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_start(" << s->cbs << ", " << url.c_str() << ")"; + bidirectional_stream_start(s->cbs, url.c_str(), 0, method, &s->header_array, + false); + unsigned int header_index; + for (header_index = 0; header_index < s->header_array.count; header_index++) { + gpr_free(const_cast(s->header_array.headers[header_index].key)); + gpr_free(const_cast(s->header_array.headers[header_index].value)); + } + stream_state->state_op_done[OP_SEND_INITIAL_METADATA] = true; + if (t->use_packet_coalescing) { + if (!stream_op->send_message && !stream_op->send_trailing_metadata) { + s->state.flush_cronet_when_ready = true; } - result = ACTION_TAKEN_WITH_CALLBACK; - } else if (stream_op->send_message && - op_can_be_run(stream_op, s, &oas->state, OP_SEND_MESSAGE)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_SEND_MESSAGE", oas); - stream_state->pending_send_message = false; - if (stream_state->state_op_done[OP_CANCEL_ERROR] || - stream_state->state_callback_received[OP_FAILED] || - stream_state->state_callback_received[OP_SUCCEEDED]) { - result = NO_ACTION_POSSIBLE; - CRONET_LOG(GPR_DEBUG, "Stream is either cancelled, failed or finished"); - } else { - size_t write_buffer_size; - create_grpc_frame( - stream_op->payload->send_message.send_message->c_slice_buffer(), - &stream_state->ws.write_buffer, &write_buffer_size, - stream_op->payload->send_message.flags); - if (write_buffer_size > 0) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, %p)", s->cbs, - stream_state->ws.write_buffer); - stream_state->state_callback_received[OP_SEND_MESSAGE] = false; - bidirectional_stream_write(s->cbs, stream_state->ws.write_buffer, - static_cast(write_buffer_size), false); - if (t->use_packet_coalescing) { - if (!stream_op->send_trailing_metadata) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); - bidirectional_stream_flush(s->cbs); - result = ACTION_TAKEN_WITH_CALLBACK; - } else { - stream_state->pending_write_for_trailer = true; - result = ACTION_TAKEN_NO_CALLBACK; - } - } else { + } + return ACTION_TAKEN_WITH_CALLBACK; +} + +static enum e_op_result execute_stream_op_send_message( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + grpc_cronet_transport* t = s->curr_ct; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + + GRPC_TRACE_VLOG(cronet, 2) << "running: " << oas << " OP_SEND_MESSAGE"; + stream_state->pending_send_message = false; + if (stream_state->state_op_done[OP_CANCEL_ERROR] || + stream_state->state_callback_received[OP_FAILED] || + stream_state->state_callback_received[OP_SUCCEEDED]) { + result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) + << "Stream is either cancelled, failed or finished"; + } else { + size_t write_buffer_size; + create_grpc_frame( + stream_op->payload->send_message.send_message->c_slice_buffer(), + &stream_state->ws.write_buffer, &write_buffer_size, + stream_op->payload->send_message.flags); + if (write_buffer_size > 0) { + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_write (" << s->cbs << ", " + << stream_state->ws.write_buffer << ")"; + stream_state->state_callback_received[OP_SEND_MESSAGE] = false; + bidirectional_stream_write(s->cbs, stream_state->ws.write_buffer, + static_cast(write_buffer_size), false); + if (t->use_packet_coalescing) { + if (!stream_op->send_trailing_metadata) { + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_flush (" << s->cbs << ")"; + bidirectional_stream_flush(s->cbs); result = ACTION_TAKEN_WITH_CALLBACK; + } else { + stream_state->pending_write_for_trailer = true; + result = ACTION_TAKEN_NO_CALLBACK; } } else { - // Should never reach here - grpc_core::Crash("unreachable"); + result = ACTION_TAKEN_WITH_CALLBACK; } - } - stream_state->state_op_done[OP_SEND_MESSAGE] = true; - oas->state.state_op_done[OP_SEND_MESSAGE] = true; - } else if (stream_op->send_trailing_metadata && - op_can_be_run(stream_op, s, &oas->state, - OP_SEND_TRAILING_METADATA)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_SEND_TRAILING_METADATA", oas); - if (stream_state->state_op_done[OP_CANCEL_ERROR] || - stream_state->state_callback_received[OP_FAILED] || - stream_state->state_callback_received[OP_SUCCEEDED]) { - result = NO_ACTION_POSSIBLE; - CRONET_LOG(GPR_DEBUG, "Stream is either cancelled, failed or finished"); } else { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_write (%p, 0)", s->cbs); - stream_state->state_callback_received[OP_SEND_MESSAGE] = false; - bidirectional_stream_write(s->cbs, "", 0, true); - if (t->use_packet_coalescing) { - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_flush (%p)", s->cbs); - bidirectional_stream_flush(s->cbs); - } - result = ACTION_TAKEN_WITH_CALLBACK; + // Should never reach here + grpc_core::Crash("unreachable"); } - stream_state->state_op_done[OP_SEND_TRAILING_METADATA] = true; - } else if (stream_op->recv_initial_metadata && - op_can_be_run(stream_op, s, &oas->state, - OP_RECV_INITIAL_METADATA)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_INITIAL_METADATA", oas); - if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, - absl::OkStatus()); - } else if (stream_state->state_callback_received[OP_FAILED]) { - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, - absl::OkStatus()); - } else if (stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, - absl::OkStatus()); - } else { - *stream_op->payload->recv_initial_metadata.recv_initial_metadata = - std::move(oas->s->state.rs.initial_metadata); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, - absl::OkStatus()); + } + stream_state->state_op_done[OP_SEND_MESSAGE] = true; + oas->state.state_op_done[OP_SEND_MESSAGE] = true; + + return result; +} + +static enum e_op_result execute_stream_op_send_trailing_metadata( + struct op_and_state* oas) { + struct stream_obj* s = oas->s; + grpc_cronet_transport* t = s->curr_ct; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) + << "running: " << oas << " OP_SEND_TRAILING_METADATA"; + if (stream_state->state_op_done[OP_CANCEL_ERROR] || + stream_state->state_callback_received[OP_FAILED] || + stream_state->state_callback_received[OP_SUCCEEDED]) { + result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) + << "Stream is either cancelled, failed or finished"; + } else { + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_write (" << s->cbs << ", 0)"; + stream_state->state_callback_received[OP_SEND_MESSAGE] = false; + bidirectional_stream_write(s->cbs, "", 0, true); + if (t->use_packet_coalescing) { + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_flush (" << s->cbs << ")"; + bidirectional_stream_flush(s->cbs); } - stream_state->state_op_done[OP_RECV_INITIAL_METADATA] = true; + result = ACTION_TAKEN_WITH_CALLBACK; + } + stream_state->state_op_done[OP_SEND_TRAILING_METADATA] = true; + + return result; +} + +static enum e_op_result execute_stream_op_recv_initial_metadata( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + GRPC_TRACE_VLOG(cronet, 2) + << "running: " << oas << " OP_RECV_INITIAL_METADATA"; + if (stream_state->state_op_done[OP_CANCEL_ERROR]) { + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, + absl::OkStatus()); + } else if (stream_state->state_callback_received[OP_FAILED]) { + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, + absl::OkStatus()); + } else if (stream_state->state_op_done[OP_RECV_TRAILING_METADATA]) { + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, + absl::OkStatus()); + } else { + *stream_op->payload->recv_initial_metadata.recv_initial_metadata = + std::move(oas->s->state.rs.initial_metadata); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_initial_metadata.recv_initial_metadata_ready, + absl::OkStatus()); + } + stream_state->state_op_done[OP_RECV_INITIAL_METADATA] = true; + return ACTION_TAKEN_NO_CALLBACK; +} + +static enum e_op_result execute_stream_op_recv_message( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) << "running: " << oas << " OP_RECV_MESSAGE"; + if (stream_state->state_op_done[OP_CANCEL_ERROR]) { + GRPC_TRACE_VLOG(cronet, 2) << "Stream is cancelled."; + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + 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_op->recv_message && - op_can_be_run(stream_op, s, &oas->state, OP_RECV_MESSAGE)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_MESSAGE", oas); - if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - CRONET_LOG(GPR_DEBUG, "Stream is cancelled."); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - 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->state_callback_received[OP_FAILED]) { - CRONET_LOG(GPR_DEBUG, "Stream failed."); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - 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) { - // No more data will be received - CRONET_LOG(GPR_DEBUG, "read stream closed"); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - 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->flush_read) { - CRONET_LOG(GPR_DEBUG, "flush read"); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - 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) { - if (stream_state->rs.received_bytes == GRPC_HEADER_SIZE_IN_BYTES && - stream_state->rs.remaining_bytes == 0) { - // Start a read operation for data - stream_state->rs.length_field_received = true; - parse_grpc_header( - reinterpret_cast(stream_state->rs.read_buffer), - &stream_state->rs.length_field, &stream_state->rs.compressed); - CRONET_LOG(GPR_DEBUG, "length field = %d", - stream_state->rs.length_field); - if (stream_state->rs.length_field > 0) { - stream_state->rs.read_buffer = static_cast( - gpr_malloc(static_cast(stream_state->rs.length_field))); - CHECK(stream_state->rs.read_buffer); - stream_state->rs.remaining_bytes = stream_state->rs.length_field; - stream_state->rs.received_bytes = 0; - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); - stream_state->state_op_done[OP_READ_REQ_MADE] = - true; // Indicates that at least one read request has been made - bidirectional_stream_read(s->cbs, stream_state->rs.read_buffer, - stream_state->rs.remaining_bytes); - result = ACTION_TAKEN_WITH_CALLBACK; - } else { - stream_state->rs.remaining_bytes = 0; - CRONET_LOG(GPR_DEBUG, "read operation complete. Empty response."); - // Clean up read_slice_buffer in case there is unread data. - stream_state->rs.read_slice_buffer.Clear(); - uint32_t flags = 0; - if (stream_state->rs.compressed) { - flags |= GRPC_WRITE_INTERNAL_COMPRESS; - } - *stream_op->payload->recv_message.flags = flags; - *stream_op->payload->recv_message.recv_message = - std::move(stream_state->rs.read_slice_buffer); - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_message.recv_message_ready, - absl::OkStatus()); - stream_state->state_op_done[OP_RECV_MESSAGE] = true; - oas->state.state_op_done[OP_RECV_MESSAGE] = true; - - // Extra read to trigger on_succeed - stream_state->rs.length_field_received = false; - stream_state->state_op_done[OP_READ_REQ_MADE] = - true; // Indicates that at least one read request has been made - read_grpc_header(s); - result = ACTION_TAKEN_NO_CALLBACK; - } - } else if (stream_state->rs.remaining_bytes == 0) { - // Start a read operation for first 5 bytes (GRPC header) - stream_state->rs.read_buffer = stream_state->rs.grpc_header_bytes; - stream_state->rs.remaining_bytes = GRPC_HEADER_SIZE_IN_BYTES; + } else if (stream_state->state_callback_received[OP_FAILED]) { + GRPC_TRACE_VLOG(cronet, 2) << "Stream failed."; + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + 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) { + // No more data will be received + GRPC_TRACE_VLOG(cronet, 2) << "read stream closed"; + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + 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->flush_read) { + GRPC_TRACE_VLOG(cronet, 2) << "flush read"; + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + 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) { + if (stream_state->rs.received_bytes == GRPC_HEADER_SIZE_IN_BYTES && + stream_state->rs.remaining_bytes == 0) { + // Start a read operation for data + stream_state->rs.length_field_received = true; + parse_grpc_header( + reinterpret_cast(stream_state->rs.read_buffer), + &stream_state->rs.length_field, &stream_state->rs.compressed); + GRPC_TRACE_VLOG(cronet, 2) + << "length field = " << stream_state->rs.length_field; + if (stream_state->rs.length_field > 0) { + stream_state->rs.read_buffer = static_cast( + gpr_malloc(static_cast(stream_state->rs.length_field))); + CHECK(stream_state->rs.read_buffer); + stream_state->rs.remaining_bytes = stream_state->rs.length_field; stream_state->rs.received_bytes = 0; - stream_state->rs.compressed = false; - CRONET_LOG(GPR_DEBUG, "bidirectional_stream_read(%p)", s->cbs); + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_read(" << s->cbs << ")"; stream_state->state_op_done[OP_READ_REQ_MADE] = true; // Indicates that at least one read request has been made bidirectional_stream_read(s->cbs, stream_state->rs.read_buffer, stream_state->rs.remaining_bytes); result = ACTION_TAKEN_WITH_CALLBACK; } else { - result = NO_ACTION_POSSIBLE; + stream_state->rs.remaining_bytes = 0; + GRPC_TRACE_VLOG(cronet, 2) + << "read operation complete. Empty response."; + // Clean up read_slice_buffer in case there is unread data. + stream_state->rs.read_slice_buffer.Clear(); + uint32_t flags = 0; + if (stream_state->rs.compressed) { + flags |= GRPC_WRITE_INTERNAL_COMPRESS; + } + *stream_op->payload->recv_message.flags = flags; + *stream_op->payload->recv_message.recv_message = + std::move(stream_state->rs.read_slice_buffer); + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + stream_state->state_op_done[OP_RECV_MESSAGE] = true; + oas->state.state_op_done[OP_RECV_MESSAGE] = true; + + // Extra read to trigger on_succeed + stream_state->rs.length_field_received = false; + stream_state->state_op_done[OP_READ_REQ_MADE] = + true; // Indicates that at least one read request has been made + read_grpc_header(s); + result = ACTION_TAKEN_NO_CALLBACK; } } else if (stream_state->rs.remaining_bytes == 0) { - CRONET_LOG(GPR_DEBUG, "read operation complete"); - grpc_slice read_data_slice = - GRPC_SLICE_MALLOC((uint32_t)stream_state->rs.length_field); - uint8_t* dst_p = GRPC_SLICE_START_PTR(read_data_slice); - memcpy(dst_p, stream_state->rs.read_buffer, - static_cast(stream_state->rs.length_field)); - null_and_maybe_free_read_buffer(s); - // Clean up read_slice_buffer in case there is unread data. - stream_state->rs.read_slice_buffer.Clear(); - stream_state->rs.read_slice_buffer.Append( - grpc_core::Slice(read_data_slice)); - uint32_t flags = 0; - if (stream_state->rs.compressed) { - flags = GRPC_WRITE_INTERNAL_COMPRESS; - } - *stream_op->payload->recv_message.flags = flags; - *stream_op->payload->recv_message.recv_message = - std::move(stream_state->rs.read_slice_buffer); + // Start a read operation for first 5 bytes (GRPC header) + stream_state->rs.read_buffer = stream_state->rs.grpc_header_bytes; + stream_state->rs.remaining_bytes = GRPC_HEADER_SIZE_IN_BYTES; + stream_state->rs.received_bytes = 0; + stream_state->rs.compressed = false; + GRPC_TRACE_VLOG(cronet, 2) + << "bidirectional_stream_read(" << s->cbs << ")"; + stream_state->state_op_done[OP_READ_REQ_MADE] = + true; // Indicates that at least one read request has been made + bidirectional_stream_read(s->cbs, stream_state->rs.read_buffer, + stream_state->rs.remaining_bytes); + result = ACTION_TAKEN_WITH_CALLBACK; + } else { + result = NO_ACTION_POSSIBLE; + } + } else if (stream_state->rs.remaining_bytes == 0) { + GRPC_TRACE_VLOG(cronet, 2) << "read operation complete"; + grpc_slice read_data_slice = + GRPC_SLICE_MALLOC((uint32_t)stream_state->rs.length_field); + uint8_t* dst_p = GRPC_SLICE_START_PTR(read_data_slice); + memcpy(dst_p, stream_state->rs.read_buffer, + static_cast(stream_state->rs.length_field)); + null_and_maybe_free_read_buffer(s); + // Clean up read_slice_buffer in case there is unread data. + stream_state->rs.read_slice_buffer.Clear(); + stream_state->rs.read_slice_buffer.Append( + grpc_core::Slice(read_data_slice)); + uint32_t flags = 0; + if (stream_state->rs.compressed) { + flags = GRPC_WRITE_INTERNAL_COMPRESS; + } + *stream_op->payload->recv_message.flags = flags; + *stream_op->payload->recv_message.recv_message = + std::move(stream_state->rs.read_slice_buffer); + grpc_core::ExecCtx::Run(DEBUG_LOCATION, + stream_op->payload->recv_message.recv_message_ready, + absl::OkStatus()); + stream_state->state_op_done[OP_RECV_MESSAGE] = true; + oas->state.state_op_done[OP_RECV_MESSAGE] = true; + // Do an extra read to trigger on_succeeded() callback in case connection + // is closed + stream_state->rs.length_field_received = false; + read_grpc_header(s); + result = ACTION_TAKEN_NO_CALLBACK; + } + return result; +} + +static enum e_op_result execute_stream_op_recv_trailing_metadata( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + + GRPC_TRACE_VLOG(cronet, 2) + << "running: " << oas << " OP_RECV_TRAILING_METADATA"; + grpc_error_handle error; + if (stream_state->state_op_done[OP_CANCEL_ERROR]) { + error = 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_error_code, stream_state->net_error, desc); + } else if (oas->s->state.rs.trailing_metadata_valid) { + *stream_op->payload->recv_trailing_metadata.recv_trailing_metadata = + std::move(oas->s->state.rs.trailing_metadata); + stream_state->rs.trailing_metadata_valid = false; + } + grpc_core::ExecCtx::Run( + DEBUG_LOCATION, + stream_op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, + error); + stream_state->state_op_done[OP_RECV_TRAILING_METADATA] = true; + + return ACTION_TAKEN_NO_CALLBACK; +} + +static enum e_op_result execute_stream_op_cancel_stream( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) << "running: " << oas << " OP_CANCEL_ERROR"; + if (s->cbs) { + GRPC_TRACE_VLOG(cronet, 2) + << "W: bidirectional_stream_cancel(" << s->cbs << ")"; + bidirectional_stream_cancel(s->cbs); + result = ACTION_TAKEN_WITH_CALLBACK; + } else { + result = ACTION_TAKEN_NO_CALLBACK; + } + stream_state->state_op_done[OP_CANCEL_ERROR] = true; + if (stream_state->cancel_error.ok()) { + stream_state->cancel_error = stream_op->payload->cancel_stream.cancel_error; + } + + return result; +} + +static enum e_op_result execute_stream_op_on_complete( + struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + struct op_state* stream_state = &s->state; + enum e_op_result result = NO_ACTION_POSSIBLE; + GRPC_TRACE_VLOG(cronet, 2) << "running: " << oas << " OP_ON_COMPLETE"; + if (stream_state->state_op_done[OP_CANCEL_ERROR]) { + if (stream_op->on_complete) { + grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, + stream_state->cancel_error); + } + } else if (stream_state->state_callback_received[OP_FAILED]) { + 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->payload->recv_message.recv_message_ready, - absl::OkStatus()); - stream_state->state_op_done[OP_RECV_MESSAGE] = true; - oas->state.state_op_done[OP_RECV_MESSAGE] = true; - // Do an extra read to trigger on_succeeded() callback in case connection - // is closed - stream_state->rs.length_field_received = false; - read_grpc_header(s); - result = ACTION_TAKEN_NO_CALLBACK; + DEBUG_LOCATION, stream_op->on_complete, + 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 + // callback + // + if (stream_op->on_complete) { + grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, + absl::OkStatus()); + } + } + oas->state.state_op_done[OP_ON_COMPLETE] = true; + oas->done = true; + // reset any send message state, only if this ON_COMPLETE is about a send. + // + if (stream_op->send_message) { + stream_state->state_callback_received[OP_SEND_MESSAGE] = false; + stream_state->state_op_done[OP_SEND_MESSAGE] = false; + } + result = ACTION_TAKEN_NO_CALLBACK; + // If this is the on_complete callback being called for a received message - + // make a note + if (stream_op->recv_message) { + stream_state->state_op_done[OP_RECV_MESSAGE_AND_ON_COMPLETE] = true; + } + + return result; +} + +static enum e_op_result execute_stream_op(struct op_and_state* oas) { + grpc_transport_stream_op_batch* stream_op = &oas->op; + struct stream_obj* s = oas->s; + enum e_op_result result = NO_ACTION_POSSIBLE; + if (stream_op->send_initial_metadata && + op_can_be_run(stream_op, s, &oas->state, OP_SEND_INITIAL_METADATA)) { + result = execute_stream_op_send_initial_metadata(oas); + } else if (stream_op->send_message && + op_can_be_run(stream_op, s, &oas->state, OP_SEND_MESSAGE)) { + result = execute_stream_op_send_message(oas); + } else if (stream_op->send_trailing_metadata && + op_can_be_run(stream_op, s, &oas->state, + OP_SEND_TRAILING_METADATA)) { + result = execute_stream_op_send_trailing_metadata(oas); + } else if (stream_op->recv_initial_metadata && + op_can_be_run(stream_op, s, &oas->state, + OP_RECV_INITIAL_METADATA)) { + result = execute_stream_op_recv_initial_metadata(oas); + } else if (stream_op->recv_message && + op_can_be_run(stream_op, s, &oas->state, OP_RECV_MESSAGE)) { + result = execute_stream_op_recv_message(oas); } else if (stream_op->recv_trailing_metadata && 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_handle error; - if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - error = 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_error_code, stream_state->net_error, desc); - } else if (oas->s->state.rs.trailing_metadata_valid) { - *stream_op->payload->recv_trailing_metadata.recv_trailing_metadata = - std::move(oas->s->state.rs.trailing_metadata); - stream_state->rs.trailing_metadata_valid = false; - } - grpc_core::ExecCtx::Run( - DEBUG_LOCATION, - stream_op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, - error); - stream_state->state_op_done[OP_RECV_TRAILING_METADATA] = true; - result = ACTION_TAKEN_NO_CALLBACK; + result = execute_stream_op_recv_trailing_metadata(oas); } else if (stream_op->cancel_stream && op_can_be_run(stream_op, s, &oas->state, OP_CANCEL_ERROR)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_CANCEL_ERROR", oas); - if (s->cbs) { - CRONET_LOG(GPR_DEBUG, "W: bidirectional_stream_cancel(%p)", s->cbs); - bidirectional_stream_cancel(s->cbs); - result = ACTION_TAKEN_WITH_CALLBACK; - } else { - result = ACTION_TAKEN_NO_CALLBACK; - } - stream_state->state_op_done[OP_CANCEL_ERROR] = true; - if (stream_state->cancel_error.ok()) { - stream_state->cancel_error = - stream_op->payload->cancel_stream.cancel_error; - } + result = execute_stream_op_cancel_stream(oas); } else if (op_can_be_run(stream_op, s, &oas->state, OP_ON_COMPLETE)) { - CRONET_LOG(GPR_DEBUG, "running: %p OP_ON_COMPLETE", oas); - if (stream_state->state_op_done[OP_CANCEL_ERROR]) { - if (stream_op->on_complete) { - grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, - stream_state->cancel_error); - } - } else if (stream_state->state_callback_received[OP_FAILED]) { - 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_error_code, stream_state->net_error, - error_message)); - } - } else { - // All actions in this stream_op are complete. Call the on_complete - // callback - // - if (stream_op->on_complete) { - grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_op->on_complete, - absl::OkStatus()); - } - } - oas->state.state_op_done[OP_ON_COMPLETE] = true; - oas->done = true; - // reset any send message state, only if this ON_COMPLETE is about a send. - // - if (stream_op->send_message) { - stream_state->state_callback_received[OP_SEND_MESSAGE] = false; - stream_state->state_op_done[OP_SEND_MESSAGE] = false; - } - result = ACTION_TAKEN_NO_CALLBACK; - // If this is the on_complete callback being called for a received message - - // make a note - if (stream_op->recv_message) { - stream_state->state_op_done[OP_RECV_MESSAGE_AND_ON_COMPLETE] = true; - } + result = execute_stream_op_on_complete(oas); } else { result = NO_ACTION_POSSIBLE; } @@ -1420,7 +1510,7 @@ void grpc_cronet_transport::InitStream(grpc_stream* gs, void grpc_cronet_transport::PerformStreamOp( grpc_stream* gs, grpc_transport_stream_op_batch* op) { - CRONET_LOG(GPR_DEBUG, "perform_stream_op"); + GRPC_TRACE_VLOG(cronet, 2) << "perform_stream_op"; if (op->send_initial_metadata && header_has_authority( op->payload->send_initial_metadata.send_initial_metadata)) { @@ -1486,8 +1576,8 @@ grpc_core::Transport* grpc_create_cronet_transport( if (0 == strcmp(args->args[i].key, GRPC_ARG_USE_CRONET_PACKET_COALESCING)) { if (GPR_UNLIKELY(args->args[i].type != GRPC_ARG_INTEGER)) { - gpr_log(GPR_ERROR, "%s ignored: it must be an integer", - GRPC_ARG_USE_CRONET_PACKET_COALESCING); + LOG(ERROR) << GRPC_ARG_USE_CRONET_PACKET_COALESCING + << " ignored: it must be an integer"; } else { ct->use_packet_coalescing = (args->args[i].value.integer != 0); } diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 5d4d13abab..a967b4c0d9 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -15,21 +15,26 @@ #include "src/core/ext/transport/inproc/inproc_transport.h" #include +#include #include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/status/status.h" #include -#include #include #include "src/core/ext/transport/inproc/legacy_inproc_transport.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/crash.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/surface/channel_create.h" +#include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" @@ -56,12 +61,14 @@ class InprocServerTransport final : public ServerTransport { state_.compare_exchange_strong(expect, ConnectionState::kReady, std::memory_order_acq_rel, std::memory_order_acquire); - MutexLock lock(&state_tracker_mu_); - state_tracker_.SetState(GRPC_CHANNEL_READY, absl::OkStatus(), - "accept function set"); + connected_state()->SetReady(); } - void Orphan() override { Unref(); } + void Orphan() override { + GRPC_TRACE_LOG(inproc, INFO) << "InprocServerTransport::Orphan(): " << this; + Disconnect(absl::UnavailableError("Server transport closed")); + Unref(); + } FilterStackTransport* filter_stack_transport() override { return nullptr; } ClientTransport* client_transport() override { return nullptr; } @@ -70,29 +77,30 @@ class InprocServerTransport final : public ServerTransport { void SetPollset(grpc_stream*, grpc_pollset*) override {} void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {} void PerformOp(grpc_transport_op* op) override { - gpr_log(GPR_INFO, "inproc server op: %s", - grpc_transport_op_string(op).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "inproc server op: " << grpc_transport_op_string(op); if (op->start_connectivity_watch != nullptr) { - MutexLock lock(&state_tracker_mu_); - state_tracker_.AddWatcher(op->start_connectivity_watch_state, - std::move(op->start_connectivity_watch)); + connected_state()->AddWatcher(op->start_connectivity_watch_state, + std::move(op->start_connectivity_watch)); } if (op->stop_connectivity_watch != nullptr) { - MutexLock lock(&state_tracker_mu_); - state_tracker_.RemoveWatcher(op->stop_connectivity_watch); + connected_state()->RemoveWatcher(op->stop_connectivity_watch); } if (op->set_accept_stream) { Crash("set_accept_stream not supported on inproc transport"); } + ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, absl::OkStatus()); } void Disconnect(absl::Status error) { - if (disconnecting_.exchange(true, std::memory_order_relaxed)) return; - disconnect_error_ = std::move(error); + RefCountedPtr connected_state; + { + MutexLock lock(&connected_state_mu_); + connected_state = std::move(connected_state_); + } + if (connected_state == nullptr) return; + connected_state->Disconnect(std::move(error)); state_.store(ConnectionState::kDisconnected, std::memory_order_relaxed); - MutexLock lock(&state_tracker_mu_); - state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN, disconnect_error_, - "inproc transport disconnected"); } absl::StatusOr AcceptCall(ClientMetadataHandle md) { @@ -105,24 +113,64 @@ class InprocServerTransport final : public ServerTransport { case ConnectionState::kReady: break; } - auto server_call = MakeCallPair(std::move(md), event_engine_.get(), - call_arena_allocator_->MakeArena()); + auto arena = call_arena_allocator_->MakeArena(); + arena->SetContext( + event_engine_.get()); + auto server_call = MakeCallPair(std::move(md), std::move(arena)); unstarted_call_handler_->StartCall(std::move(server_call.handler)); return std::move(server_call.initiator); } OrphanablePtr MakeClientTransport(); + class ConnectedState : public RefCounted { + public: + ~ConnectedState() override { + state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN, disconnect_error_, + "inproc transport disconnected"); + } + + void SetReady() { + MutexLock lock(&state_tracker_mu_); + state_tracker_.SetState(GRPC_CHANNEL_READY, absl::OkStatus(), + "accept function set"); + } + + void Disconnect(absl::Status error) { + disconnect_error_ = std::move(error); + } + + void AddWatcher(grpc_connectivity_state initial_state, + OrphanablePtr watcher) { + MutexLock lock(&state_tracker_mu_); + state_tracker_.AddWatcher(initial_state, std::move(watcher)); + } + + void RemoveWatcher(ConnectivityStateWatcherInterface* watcher) { + MutexLock lock(&state_tracker_mu_); + state_tracker_.RemoveWatcher(watcher); + } + + private: + absl::Status disconnect_error_; + Mutex state_tracker_mu_; + ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(state_tracker_mu_){ + "inproc_server_transport", GRPC_CHANNEL_CONNECTING}; + }; + + RefCountedPtr connected_state() { + MutexLock lock(&connected_state_mu_); + return connected_state_; + } + private: enum class ConnectionState : uint8_t { kInitial, kReady, kDisconnected }; std::atomic state_{ConnectionState::kInitial}; - std::atomic disconnecting_{false}; RefCountedPtr unstarted_call_handler_; - absl::Status disconnect_error_; - Mutex state_tracker_mu_; - ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(state_tracker_mu_){ - "inproc_server_transport", GRPC_CHANNEL_CONNECTING}; + Mutex connected_state_mu_; + RefCountedPtr connected_state_ + ABSL_GUARDED_BY(connected_state_mu_) = MakeRefCounted(); const std::shared_ptr event_engine_; const RefCountedPtr call_arena_allocator_; @@ -139,19 +187,27 @@ class InprocClientTransport final : public ClientTransport { "pull_initial_metadata", TrySeq(child_call_handler.PullClientInitialMetadata(), [server_transport = server_transport_, - child_call_handler](ClientMetadataHandle md) { + connected_state = server_transport_->connected_state(), + child_call_handler](ClientMetadataHandle md) mutable { auto server_call_initiator = server_transport->AcceptCall(std::move(md)); if (!server_call_initiator.ok()) { return server_call_initiator.status(); } - ForwardCall(child_call_handler, - std::move(*server_call_initiator)); + ForwardCall( + child_call_handler, std::move(*server_call_initiator), + [connected_state = + std::move(connected_state)](ServerMetadata& md) { + md.Set(GrpcStatusFromWire(), true); + }); return absl::OkStatus(); })); } - void Orphan() override { delete this; } + void Orphan() override { + GRPC_TRACE_LOG(inproc, INFO) << "InprocClientTransport::Orphan(): " << this; + Unref(); + } FilterStackTransport* filter_stack_transport() override { return nullptr; } ClientTransport* client_transport() override { return this; } @@ -170,8 +226,10 @@ class InprocClientTransport final : public ClientTransport { const RefCountedPtr server_transport_; }; -bool UsePromiseBasedTransport() { - return IsPromiseBasedInprocTransportEnabled(); +bool UsePromiseBasedTransport(const ChannelArgs& channel_args) { + return channel_args + .GetBool("grpc.experimental.promise_based_inproc_transport") + .value_or(IsPromiseBasedInprocTransportEnabled()); } OrphanablePtr @@ -182,8 +240,7 @@ InprocServerTransport::MakeClientTransport() { RefCountedPtr MakeLameChannel(absl::string_view why, absl::Status error) { - gpr_log(GPR_ERROR, "%s: %s", std::string(why).c_str(), - std::string(error.message()).c_str()); + LOG(ERROR) << why << ": " << error.message(); intptr_t integer; grpc_status_code status = GRPC_STATUS_INTERNAL; if (grpc_error_get_int(error, StatusIntProperty::kRpcStatus, &integer)) { @@ -210,7 +267,8 @@ RefCountedPtr MakeInprocChannel(Server* server, std::ignore = server_transport.release(); // consumed by SetupTransport auto channel = ChannelCreate( "inproc", - client_channel_args.Set(GRPC_ARG_DEFAULT_AUTHORITY, "inproc.authority"), + client_channel_args.Set(GRPC_ARG_DEFAULT_AUTHORITY, "inproc.authority") + .Set(GRPC_ARG_USE_V3_STACK, true), GRPC_CLIENT_DIRECT_CHANNEL, client_transport.release()); if (!channel.ok()) { return MakeLameChannel("Failed to create client channel", channel.status()); @@ -235,13 +293,14 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, void* reserved) { grpc_core::ApplicationCallbackExecCtx app_exec_ctx; grpc_core::ExecCtx exec_ctx; - if (!grpc_core::UsePromiseBasedTransport()) { + const auto channel_args = grpc_core::CoreConfiguration::Get() + .channel_args_preconditioning() + .PreconditionChannelArgs(args); + if (!grpc_core::UsePromiseBasedTransport(channel_args)) { return grpc_legacy_inproc_channel_create(server, args, reserved); } return grpc_core::MakeInprocChannel(grpc_core::Server::FromC(server), - grpc_core::CoreConfiguration::Get() - .channel_args_preconditioning() - .PreconditionChannelArgs(args)) + channel_args) .release() ->c_ptr(); } diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index fd8699f9b9..ae2441db5d 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -60,7 +59,6 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/lib/surface/channel_stack_type.h" @@ -69,13 +67,6 @@ #include "src/core/lib/transport/transport.h" #include "src/core/server/server.h" -#define INPROC_LOG(...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(inproc)) { \ - gpr_log(__VA_ARGS__); \ - } \ - } while (0) - namespace { struct inproc_stream; bool cancel_stream_locked(inproc_stream* s, grpc_error_handle error); @@ -149,16 +140,16 @@ struct inproc_transport final : public grpc_core::FilterStackTransport { void Orphan() override; void ref() { - INPROC_LOG(GPR_INFO, "ref_transport %p", this); + GRPC_TRACE_LOG(inproc, INFO) << "ref_transport " << this; gpr_ref(&refs); } void unref() { - INPROC_LOG(GPR_INFO, "unref_transport %p", this); + GRPC_TRACE_LOG(inproc, INFO) << "unref_transport " << this; if (!gpr_unref(&refs)) { return; } - INPROC_LOG(GPR_INFO, "really_destroy_transport %p", this); + GRPC_TRACE_LOG(inproc, INFO) << "really_destroy_transport " << this; this->~inproc_transport(); gpr_free(this); } @@ -202,8 +193,9 @@ struct inproc_stream { // Pass the client-side stream address to the server-side for a ref ref("inproc_init_stream:clt"); // ref it now on behalf of server // side to avoid destruction - INPROC_LOG(GPR_INFO, "calling accept stream cb %p %p", - st->accept_stream_cb, st->accept_stream_data); + GRPC_TRACE_LOG(inproc, INFO) + << "calling accept stream cb " << st->accept_stream_cb << " " + << st->accept_stream_data; (*st->accept_stream_cb)(st->accept_stream_data, t, this); } else { // This is the server-side and is being called through accept_stream_cb @@ -252,12 +244,12 @@ struct inproc_stream { #define STREAM_UNREF(refs, reason) grpc_stream_unref(refs) #endif void ref(const char* reason) { - INPROC_LOG(GPR_INFO, "ref_stream %p %s", this, reason); + GRPC_TRACE_LOG(inproc, INFO) << "ref_stream " << this << " " << reason; STREAM_REF(refs, reason); } void unref(const char* reason) { - INPROC_LOG(GPR_INFO, "unref_stream %p %s", this, reason); + GRPC_TRACE_LOG(inproc, INFO) << "unref_stream " << this << " " << reason; STREAM_UNREF(refs, reason); } #undef STREAM_REF @@ -373,7 +365,8 @@ void inproc_transport::InitStream(grpc_stream* gs, grpc_stream_refcount* refcount, const void* server_data, grpc_core::Arena* arena) { - INPROC_LOG(GPR_INFO, "init_stream %p %p %p", this, gs, server_data); + GRPC_TRACE_LOG(inproc, INFO) + << "init_stream " << this << " " << gs << " " << server_data; new (gs) inproc_stream(this, refcount, server_data, arena); } @@ -435,8 +428,9 @@ void complete_if_batch_end_locked(inproc_stream* s, grpc_error_handle error, int is_rtm = static_cast(op == s->recv_trailing_md_op); if ((is_sm + is_stm + is_rim + is_rm + is_rtm) == 1) { - INPROC_LOG(GPR_INFO, "%s %p %p %p %s", msg, s, op, op->on_complete, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << msg << " " << s << " " << op << " " << op->on_complete << " " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_complete, error); } } @@ -449,7 +443,7 @@ void maybe_process_ops_locked(inproc_stream* s, grpc_error_handle error) { } void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { - INPROC_LOG(GPR_INFO, "op_state_machine %p fail_helper", s); + GRPC_TRACE_LOG(inproc, INFO) << "op_state_machine " << s << " fail_helper"; // If we're failing this side, we need to make sure that // we also send or have already sent trailing metadata if (!s->trailing_md_sent) { @@ -501,10 +495,10 @@ void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { *s->recv_initial_md_op->payload->recv_initial_metadata .trailing_metadata_available = true; } - INPROC_LOG(GPR_INFO, - "fail_helper %p scheduling initial-metadata-ready %s %s", s, - grpc_core::StatusToString(error).c_str(), - grpc_core::StatusToString(err).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "fail_helper " << s << " scheduling initial-metadata-ready " + << grpc_core::StatusToString(error) << " " + << grpc_core::StatusToString(err); grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_initial_md_op->payload->recv_initial_metadata @@ -518,8 +512,9 @@ void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { s->recv_initial_md_op = nullptr; } if (s->recv_message_op) { - INPROC_LOG(GPR_INFO, "fail_helper %p scheduling message-ready %s", s, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "fail_helper " << s << " scheduling message-ready " + << grpc_core::StatusToString(error); if (s->recv_message_op->payload->recv_message .call_failed_before_recv_message != nullptr) { *s->recv_message_op->payload->recv_message @@ -547,15 +542,17 @@ void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { s->send_trailing_md_op = nullptr; } if (s->recv_trailing_md_op) { - INPROC_LOG(GPR_INFO, "fail_helper %p scheduling trailing-metadata-ready %s", - s, grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "fail_helper " << s << " scheduling trailing-metadata-ready " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_trailing_md_op->payload->recv_trailing_metadata .recv_trailing_metadata_ready, error); - INPROC_LOG(GPR_INFO, "fail_helper %p scheduling trailing-md-on-complete %s", - s, grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "fail_helper " << s << " scheduling trailing-md-on-complete " + << grpc_core::StatusToString(error); complete_if_batch_end_locked( s, error, s->recv_trailing_md_op, "fail_helper scheduling recv-trailing-metadata-on-complete"); @@ -579,8 +576,8 @@ void message_transfer_locked(inproc_stream* sender, inproc_stream* receiver) { *receiver->recv_message_op->payload->recv_message.flags = sender->send_message_op->payload->send_message.flags; - INPROC_LOG(GPR_INFO, "message_transfer_locked %p scheduling message-ready", - receiver); + GRPC_TRACE_LOG(inproc, INFO) + << "message_transfer_locked " << receiver << " scheduling message-ready"; grpc_core::ExecCtx::Run( DEBUG_LOCATION, receiver->recv_message_op->payload->recv_message.recv_message_ready, @@ -606,7 +603,7 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { bool needs_close = false; - INPROC_LOG(GPR_INFO, "op_state_machine %p", s); + GRPC_TRACE_LOG(inproc, INFO) << "op_state_machine " << s; // cancellation takes precedence inproc_stream* other = s->other_side; @@ -653,7 +650,7 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { : &other->to_read_trailing_md_filled; if (*destfilled || s->trailing_md_sent) { // The buffer is already in use; that's an error! - INPROC_LOG(GPR_INFO, "Extra trailing metadata %p", s); + GRPC_TRACE_LOG(inproc, INFO) << "Extra trailing metadata " << s; new_err = GRPC_ERROR_CREATE("Extra trailing metadata"); fail_helper_locked(s, new_err); goto done; @@ -669,15 +666,15 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { *s->send_trailing_md_op->payload->send_trailing_metadata.sent = true; } if (!s->t->is_client && s->trailing_md_recvd && s->recv_trailing_md_op) { - INPROC_LOG(GPR_INFO, - "op_state_machine %p scheduling trailing-metadata-ready", s); + GRPC_TRACE_LOG(inproc, INFO) << "op_state_machine " << s + << " scheduling trailing-metadata-ready"; grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_trailing_md_op->payload->recv_trailing_metadata .recv_trailing_metadata_ready, absl::OkStatus()); - INPROC_LOG(GPR_INFO, - "op_state_machine %p scheduling trailing-md-on-complete", s); + GRPC_TRACE_LOG(inproc, INFO) << "op_state_machine " << s + << " scheduling trailing-md-on-complete"; grpc_core::ExecCtx::Run(DEBUG_LOCATION, s->recv_trailing_md_op->on_complete, absl::OkStatus()); @@ -694,11 +691,11 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { if (s->recv_initial_md_op) { if (s->initial_md_recvd) { new_err = GRPC_ERROR_CREATE("Already recvd initial md"); - INPROC_LOG( - GPR_INFO, - "op_state_machine %p scheduling on_complete errors for already " - "recvd initial md %s", - s, grpc_core::StatusToString(new_err).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s + << " scheduling on_complete errors for already " + "recvd initial md " + << grpc_core::StatusToString(new_err); fail_helper_locked(s, new_err); goto done; } @@ -749,20 +746,20 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { if (s->to_read_trailing_md_filled) { if (s->trailing_md_recvd) { if (s->trailing_md_recvd_implicit_only) { - INPROC_LOG(GPR_INFO, - "op_state_machine %p already implicitly received trailing " - "metadata, so ignoring new trailing metadata from client", - s); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s + << " already implicitly received trailing metadata, so " + "ignoring new trailing metadata from client"; s->to_read_trailing_md.Clear(); s->to_read_trailing_md_filled = false; s->trailing_md_recvd_implicit_only = false; } else { new_err = GRPC_ERROR_CREATE("Already recvd trailing md"); - INPROC_LOG( - GPR_INFO, - "op_state_machine %p scheduling on_complete errors for already " - "recvd trailing md %s", - s, grpc_core::StatusToString(new_err).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s + << " scheduling on_complete errors for already recvd trailing " + "md " + << grpc_core::StatusToString(new_err); fail_helper_locked(s, new_err); goto done; } @@ -771,7 +768,8 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { // This message needs to be wrapped up because it will never be // satisfied s->recv_message_op->payload->recv_message.recv_message->reset(); - INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling message-ready", s); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s << " scheduling message-ready"; grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_message_op->payload->recv_message.recv_message_ready, @@ -822,9 +820,9 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { needs_close = s->trailing_md_sent; } } else if (!s->trailing_md_recvd) { - INPROC_LOG( - GPR_INFO, - "op_state_machine %p has trailing md but not yet waiting for it", s); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s + << " has trailing md but not yet waiting for it"; } } if (!s->t->is_client && s->trailing_md_sent && @@ -832,8 +830,9 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { // In this case, we don't care to receive the write-close from the client // because we have already sent status and the RPC is over as far as we // are concerned. - INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling trailing-md-ready %s", - s, grpc_core::StatusToString(new_err).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s << " scheduling trailing-md-ready " + << grpc_core::StatusToString(new_err); grpc_core::ExecCtx::Run( DEBUG_LOCATION, s->recv_trailing_md_op->payload->recv_trailing_metadata @@ -851,7 +850,8 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { if (s->trailing_md_recvd && s->recv_message_op) { // No further message will come on this stream, so finish off the // recv_message_op - INPROC_LOG(GPR_INFO, "op_state_machine %p scheduling message-ready", s); + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s << " scheduling message-ready"; s->recv_message_op->payload->recv_message.recv_message->reset(); grpc_core::ExecCtx::Run( DEBUG_LOCATION, @@ -873,12 +873,12 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { } if (s->send_message_op || s->send_trailing_md_op || s->recv_initial_md_op || s->recv_message_op || s->recv_trailing_md_op) { - // Didn't get the item we wanted so we still need to get - // rescheduled - INPROC_LOG( - GPR_INFO, "op_state_machine %p still needs closure %p %p %p %p %p", s, - s->send_message_op, s->send_trailing_md_op, s->recv_initial_md_op, - s->recv_message_op, s->recv_trailing_md_op); + // Didn't get the item we wanted so we still need to get rescheduled + GRPC_TRACE_LOG(inproc, INFO) + << "op_state_machine " << s << " still needs closure " + << s->send_message_op << " " << s->send_trailing_md_op << " " + << s->recv_initial_md_op << " " << s->recv_message_op << " " + << s->recv_trailing_md_op; s->ops_needed = true; } done: @@ -890,8 +890,8 @@ void op_state_machine_locked(inproc_stream* s, grpc_error_handle 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_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "cancel_stream " << s << " with " << grpc_core::StatusToString(error); if (s->cancel_self_error.ok()) { ret = true; s->cancel_self_error = error; @@ -944,7 +944,8 @@ bool cancel_stream_locked(inproc_stream* s, grpc_error_handle error) { void inproc_transport::PerformStreamOp(grpc_stream* gs, grpc_transport_stream_op_batch* op) { - INPROC_LOG(GPR_INFO, "perform_stream_op %p %p %p", this, gs, op); + GRPC_TRACE_LOG(inproc, INFO) + << "perform_stream_op " << this << " " << gs << " " << op; inproc_stream* s = reinterpret_cast(gs); gpr_mu* mu = &s->t->mu->mu; // save aside in case s gets closed gpr_mu_lock(mu); @@ -980,14 +981,15 @@ void inproc_transport::PerformStreamOp(grpc_stream* gs, // already self-canceled so still give it an error error = s->cancel_self_error; } else { - INPROC_LOG(GPR_INFO, "perform_stream_op %p %s%s%s%s%s%s%s", s, - s->t->is_client ? "client" : "server", - op->send_initial_metadata ? " send_initial_metadata" : "", - op->send_message ? " send_message" : "", - op->send_trailing_metadata ? " send_trailing_metadata" : "", - op->recv_initial_metadata ? " recv_initial_metadata" : "", - op->recv_message ? " recv_message" : "", - op->recv_trailing_metadata ? " recv_trailing_metadata" : ""); + GRPC_TRACE_LOG(inproc, INFO) + << "perform_stream_op " << s + << (s->t->is_client ? " client" : " server") + << (op->send_initial_metadata ? " send_initial_metadata" : "") + << (op->send_message ? " send_message" : "") + << (op->send_trailing_metadata ? " send_trailing_metadata" : "") + << (op->recv_initial_metadata ? " recv_initial_metadata" : "") + << (op->recv_message ? " recv_message" : "") + << (op->recv_trailing_metadata ? " recv_trailing_metadata" : ""); } inproc_stream* other = s->other_side; @@ -1003,7 +1005,7 @@ void inproc_transport::PerformStreamOp(grpc_stream* gs, : &other->to_read_initial_md_filled; if (*destfilled || s->initial_md_sent) { // The buffer is already in use; that's an error! - INPROC_LOG(GPR_INFO, "Extra initial metadata %p", s); + GRPC_TRACE_LOG(inproc, INFO) << "Extra initial metadata " << s; error = GRPC_ERROR_CREATE("Extra initial metadata"); } else { if (!s->other_side_closed) { @@ -1081,20 +1083,18 @@ void inproc_transport::PerformStreamOp(grpc_stream* gs, *op->payload->recv_initial_metadata.trailing_metadata_available = true; } - INPROC_LOG( - GPR_INFO, - "perform_stream_op error %p scheduling initial-metadata-ready %s", - s, grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) << "perform_stream_op error " << s + << " scheduling initial-metadata-ready " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run( DEBUG_LOCATION, op->payload->recv_initial_metadata.recv_initial_metadata_ready, error); } if (op->recv_message) { - INPROC_LOG( - GPR_INFO, - "perform_stream_op error %p scheduling recv message-ready %s", s, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) << "perform_stream_op error " << s + << " scheduling recv message-ready " + << grpc_core::StatusToString(error); if (op->payload->recv_message.call_failed_before_recv_message != nullptr) { *op->payload->recv_message.call_failed_before_recv_message = true; @@ -1104,25 +1104,27 @@ void inproc_transport::PerformStreamOp(grpc_stream* gs, error); } if (op->recv_trailing_metadata) { - INPROC_LOG(GPR_INFO, - "perform_stream_op error %p scheduling " - "trailing-metadata-ready %s", - s, grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) << "perform_stream_op error " << s + << " scheduling trailing-metadata-ready " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run( DEBUG_LOCATION, op->payload->recv_trailing_metadata.recv_trailing_metadata_ready, error); } } - INPROC_LOG(GPR_INFO, "perform_stream_op %p scheduling on_complete %s", s, - grpc_core::StatusToString(error).c_str()); + GRPC_TRACE_LOG(inproc, INFO) + << "perform_stream_op " << s << " scheduling on_complete " + << grpc_core::StatusToString(error); grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_complete, error); } gpr_mu_unlock(mu); } void close_transport_locked(inproc_transport* t) { - INPROC_LOG(GPR_INFO, "close_transport %p %d", t, t->is_closed); + GRPC_TRACE_LOG(inproc, INFO) + << "close_transport " << t << " " << t->is_closed; + t->state_tracker.SetState(GRPC_CHANNEL_SHUTDOWN, absl::Status(), "close transport"); if (!t->is_closed) { @@ -1140,7 +1142,7 @@ void close_transport_locked(inproc_transport* t) { } void inproc_transport::PerformOp(grpc_transport_op* op) { - INPROC_LOG(GPR_INFO, "perform_transport_op %p %p", this, op); + GRPC_TRACE_LOG(inproc, INFO) << "perform_transport_op " << this << " " << op; gpr_mu_lock(&mu->mu); if (op->start_connectivity_watch != nullptr) { state_tracker.AddWatcher(op->start_connectivity_watch_state, @@ -1174,7 +1176,8 @@ void inproc_transport::PerformOp(grpc_transport_op* op) { void inproc_transport::DestroyStream(grpc_stream* gs, grpc_closure* then_schedule_closure) { - INPROC_LOG(GPR_INFO, "destroy_stream %p %p", gs, then_schedule_closure); + GRPC_TRACE_LOG(inproc, INFO) + << "destroy_stream " << gs << " " << then_schedule_closure; inproc_stream* s = reinterpret_cast(gs); gpr_mu_lock(&mu->mu); close_stream_locked(s); @@ -1185,7 +1188,7 @@ void inproc_transport::DestroyStream(grpc_stream* gs, } void inproc_transport::Orphan() { - INPROC_LOG(GPR_INFO, "destroy_transport %p", this); + GRPC_TRACE_LOG(inproc, INFO) << "destroy_transport " << this; gpr_mu_lock(&mu->mu); close_transport_locked(this); gpr_mu_unlock(&mu->mu); @@ -1218,7 +1221,7 @@ void inproc_transport::SetPollsetSet(grpc_stream* /*gs*/, // void inproc_transports_create(grpc_core::Transport** server_transport, grpc_core::Transport** client_transport) { - INPROC_LOG(GPR_INFO, "inproc_transports_create"); + GRPC_TRACE_LOG(inproc, INFO) << "inproc_transports_create"; shared_mu* mu = new (gpr_malloc(sizeof(*mu))) shared_mu(); inproc_transport* st = new (gpr_malloc(sizeof(*st))) inproc_transport(mu, /*is_client=*/false); @@ -1234,8 +1237,8 @@ void inproc_transports_create(grpc_core::Transport** server_transport, grpc_channel* grpc_legacy_inproc_channel_create(grpc_server* server, const grpc_channel_args* args, void* /*reserved*/) { - GRPC_API_TRACE("grpc_inproc_channel_create(server=%p, args=%p)", 2, - (server, args)); + GRPC_TRACE_LOG(api, INFO) << "grpc_inproc_channel_create(server=" << server + << ", args=" << args << ")"; grpc_core::ExecCtx exec_ctx; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h index 891fb3aab6..24c9c36d8d 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb.h @@ -449,11 +449,11 @@ UPB_INLINE bool envoy_admin_v3_CertificateDetails_has_ocsp_details(const envoy_a UPB_INLINE void envoy_admin_v3_CertificateDetails_set_path(envoy_admin_v3_CertificateDetails *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_serial_number(envoy_admin_v3_CertificateDetails *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_admin_v3_SubjectAlternateName** envoy_admin_v3_CertificateDetails_mutable_subject_alt_names(envoy_admin_v3_CertificateDetails* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -487,11 +487,11 @@ UPB_INLINE struct envoy_admin_v3_SubjectAlternateName* envoy_admin_v3_Certificat } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_days_until_expiration(envoy_admin_v3_CertificateDetails *msg, uint64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_valid_from(envoy_admin_v3_CertificateDetails *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 64), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_mutable_valid_from(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_valid_from(msg); @@ -503,7 +503,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_m } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_expiration_time(envoy_admin_v3_CertificateDetails *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 72), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_mutable_expiration_time(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_expiration_time(msg); @@ -515,7 +515,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_m } UPB_INLINE void envoy_admin_v3_CertificateDetails_set_ocsp_details(envoy_admin_v3_CertificateDetails *msg, envoy_admin_v3_CertificateDetails_OcspDetails* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 80), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_CertificateDetails_OcspDetails* envoy_admin_v3_CertificateDetails_mutable_ocsp_details(envoy_admin_v3_CertificateDetails* msg, upb_Arena* arena) { struct envoy_admin_v3_CertificateDetails_OcspDetails* sub = (struct envoy_admin_v3_CertificateDetails_OcspDetails*)envoy_admin_v3_CertificateDetails_ocsp_details(msg); @@ -597,7 +597,7 @@ UPB_INLINE bool envoy_admin_v3_CertificateDetails_OcspDetails_has_expiration(con UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_set_valid_from(envoy_admin_v3_CertificateDetails_OcspDetails *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_OcspDetails_mutable_valid_from(envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_OcspDetails_valid_from(msg); @@ -609,7 +609,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_O } UPB_INLINE void envoy_admin_v3_CertificateDetails_OcspDetails_set_expiration(envoy_admin_v3_CertificateDetails_OcspDetails *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_CertificateDetails_OcspDetails_mutable_expiration(envoy_admin_v3_CertificateDetails_OcspDetails* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_CertificateDetails_OcspDetails_expiration(msg); @@ -718,15 +718,15 @@ UPB_INLINE bool envoy_admin_v3_SubjectAlternateName_has_ip_address(const envoy_a UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_dns(envoy_admin_v3_SubjectAlternateName *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_uri(envoy_admin_v3_SubjectAlternateName *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_ip_address(envoy_admin_v3_SubjectAlternateName *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c index acf64ab512..f5ba742e8b 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__admin__v3__Certificates_msg_init = { &envoy_admin_v3_Certificates_submsgs[0], &envoy_admin_v3_Certificates__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Certificates", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -47,6 +50,9 @@ const upb_MiniTable envoy__admin__v3__Certificate_msg_init = { &envoy_admin_v3_Certificate_submsgs[0], &envoy_admin_v3_Certificate__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Certificate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -76,6 +82,9 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = { &envoy_admin_v3_CertificateDetails_submsgs[0], &envoy_admin_v3_CertificateDetails__fields[0], UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.CertificateDetails", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -102,6 +111,9 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init = &envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[0], &envoy_admin_v3_CertificateDetails_OcspDetails__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.CertificateDetails.OcspDetails", +#endif }; static const upb_MiniTableField envoy_admin_v3_SubjectAlternateName__fields[3] = { @@ -114,6 +126,9 @@ const upb_MiniTable envoy__admin__v3__SubjectAlternateName_msg_init = { NULL, &envoy_admin_v3_SubjectAlternateName__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SubjectAlternateName", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h index 868df0fd69..1978b8504d 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb.h @@ -307,15 +307,15 @@ UPB_INLINE upb_StringView envoy_admin_v3_ClusterStatus_eds_service_name(const en UPB_INLINE void envoy_admin_v3_ClusterStatus_set_name(envoy_admin_v3_ClusterStatus *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_added_via_api(envoy_admin_v3_ClusterStatus *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_ClusterStatus_success_rate_ejection_threshold(msg); @@ -357,7 +357,7 @@ UPB_INLINE struct envoy_admin_v3_HostStatus* envoy_admin_v3_ClusterStatus_add_ho } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_local_origin_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 48), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_local_origin_success_rate_ejection_threshold(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_ClusterStatus_local_origin_success_rate_ejection_threshold(msg); @@ -369,7 +369,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_ClusterStatus_mutable_lo } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_circuit_breakers(envoy_admin_v3_ClusterStatus *msg, struct envoy_config_cluster_v3_CircuitBreakers* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 56), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_admin_v3_ClusterStatus_mutable_circuit_breakers(envoy_admin_v3_ClusterStatus* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_CircuitBreakers* sub = (struct envoy_config_cluster_v3_CircuitBreakers*)envoy_admin_v3_ClusterStatus_circuit_breakers(msg); @@ -381,11 +381,11 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_admin_v3_Cluste } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_observability_name(envoy_admin_v3_ClusterStatus *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ClusterStatus_set_eds_service_name(envoy_admin_v3_ClusterStatus *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(44, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.HostStatus */ @@ -575,7 +575,7 @@ UPB_INLINE bool envoy_admin_v3_HostStatus_has_locality(const envoy_admin_v3_Host UPB_INLINE void envoy_admin_v3_HostStatus_set_address(envoy_admin_v3_HostStatus *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_HostStatus_mutable_address(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_admin_v3_HostStatus_address(msg); @@ -617,7 +617,7 @@ UPB_INLINE struct envoy_admin_v3_SimpleMetric* envoy_admin_v3_HostStatus_add_sta } UPB_INLINE void envoy_admin_v3_HostStatus_set_health_status(envoy_admin_v3_HostStatus *msg, envoy_admin_v3_HostHealthStatus* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostStatus_mutable_health_status(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_admin_v3_HostHealthStatus* sub = (struct envoy_admin_v3_HostHealthStatus*)envoy_admin_v3_HostStatus_health_status(msg); @@ -629,7 +629,7 @@ UPB_INLINE struct envoy_admin_v3_HostHealthStatus* envoy_admin_v3_HostStatus_mut } UPB_INLINE void envoy_admin_v3_HostStatus_set_success_rate(envoy_admin_v3_HostStatus *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_success_rate(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_HostStatus_success_rate(msg); @@ -641,19 +641,19 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_succe } UPB_INLINE void envoy_admin_v3_HostStatus_set_weight(envoy_admin_v3_HostStatus *msg, uint32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostStatus_set_hostname(envoy_admin_v3_HostStatus *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(44, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostStatus_set_priority(envoy_admin_v3_HostStatus *msg, uint32_t value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostStatus_set_local_origin_success_rate(envoy_admin_v3_HostStatus *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 72), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_local_origin_success_rate(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_admin_v3_HostStatus_local_origin_success_rate(msg); @@ -665,7 +665,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_admin_v3_HostStatus_mutable_local } UPB_INLINE void envoy_admin_v3_HostStatus_set_locality(envoy_admin_v3_HostStatus *msg, struct envoy_config_core_v3_Locality* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Locality* envoy_admin_v3_HostStatus_mutable_locality(envoy_admin_v3_HostStatus* msg, upb_Arena* arena) { struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_admin_v3_HostStatus_locality(msg); @@ -811,35 +811,35 @@ UPB_INLINE bool envoy_admin_v3_HostHealthStatus_active_hc_timeout(const envoy_ad UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_failed_active_health_check(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_failed_outlier_check(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_eds_health_status(envoy_admin_v3_HostHealthStatus *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_failed_active_degraded_check(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {4, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_pending_dynamic_removal(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {5, 17, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_pending_active_hc(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {6, 18, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_excluded_via_immediate_hc_fail(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {7, 19, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_active_hc_timeout(envoy_admin_v3_HostHealthStatus *msg, bool value) { const upb_MiniTableField field = {8, 20, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c index c613ef5287..57e730c678 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__admin__v3__Clusters_msg_init = { &envoy_admin_v3_Clusters_submsgs[0], &envoy_admin_v3_Clusters__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Clusters", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -60,6 +63,9 @@ const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = { &envoy_admin_v3_ClusterStatus_submsgs[0], &envoy_admin_v3_ClusterStatus__fields[0], UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ClusterStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -105,6 +111,9 @@ const upb_MiniTable envoy__admin__v3__HostStatus_msg_init = { &envoy_admin_v3_HostStatus_submsgs[0], &envoy_admin_v3_HostStatus__fields[0], UPB_SIZE(56, 88), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.HostStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -132,6 +141,9 @@ const upb_MiniTable envoy__admin__v3__HostHealthStatus_msg_init = { NULL, &envoy_admin_v3_HostHealthStatus__fields[0], 24, 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.HostHealthStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h index 96de3e74c1..3d6440983a 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb.h @@ -209,7 +209,7 @@ UPB_INLINE bool envoy_admin_v3_BootstrapConfigDump_has_last_updated(const envoy_ UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_bootstrap(envoy_admin_v3_BootstrapConfigDump *msg, struct envoy_config_bootstrap_v3_Bootstrap* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -221,7 +221,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap* envoy_admin_v3_BootstrapC } UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_last_updated(envoy_admin_v3_BootstrapConfigDump *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -579,15 +579,15 @@ UPB_INLINE int32_t envoy_admin_v3_SecretsConfigDump_DynamicSecret_client_status( UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_name(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_version_info(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_last_updated(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -599,7 +599,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_Dy } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_secret(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -611,7 +611,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_DynamicS } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_error_state(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, struct envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -623,7 +623,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_SecretsConfi } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_client_status(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.SecretsConfigDump.StaticSecret */ @@ -709,11 +709,11 @@ UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_StaticSecret_has_secret(const e UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_name(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_last_updated(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -725,7 +725,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_St } UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_secret(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c index 995cdedffb..10dc05057e 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = { &envoy_admin_v3_ConfigDump_submsgs[0], &envoy_admin_v3_ConfigDump__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -50,6 +53,9 @@ const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = { &envoy_admin_v3_BootstrapConfigDump_submsgs[0], &envoy_admin_v3_BootstrapConfigDump__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.BootstrapConfigDump", +#endif }; static const upb_MiniTableSub envoy_admin_v3_SecretsConfigDump_submsgs[3] = { @@ -68,6 +74,9 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = { &envoy_admin_v3_SecretsConfigDump_submsgs[0], &envoy_admin_v3_SecretsConfigDump__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SecretsConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -95,6 +104,9 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0], &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SecretsConfigDump.DynamicSecret", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -122,6 +134,9 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init = &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0], &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SecretsConfigDump.StaticSecret", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h index 5ffe9762a3..74114bc69b 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb.h @@ -151,7 +151,7 @@ UPB_INLINE upb_StringView envoy_admin_v3_UpdateFailureState_version_info(const e UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_failed_configuration(envoy_admin_v3_UpdateFailureState *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -163,7 +163,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_UpdateFailureState_mutable } UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_last_update_attempt(envoy_admin_v3_UpdateFailureState *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -175,11 +175,11 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_UpdateFailureState_m } UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_details(envoy_admin_v3_UpdateFailureState *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_version_info(envoy_admin_v3_UpdateFailureState *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.ListenersConfigDump */ @@ -297,7 +297,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_ListenersConfigDump_dynamic_listeners_muta UPB_INLINE void envoy_admin_v3_ListenersConfigDump_set_version_info(envoy_admin_v3_ListenersConfigDump *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener** envoy_admin_v3_ListenersConfigDump_mutable_static_listeners(envoy_admin_v3_ListenersConfigDump* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -431,7 +431,7 @@ UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_StaticListener_has_last_updat UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_set_listener(envoy_admin_v3_ListenersConfigDump_StaticListener *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -443,7 +443,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_Static } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_set_last_updated(envoy_admin_v3_ListenersConfigDump_StaticListener *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -537,11 +537,11 @@ UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_DynamicListenerState_has_last UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_version_info(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_listener(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -553,7 +553,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_Dynami } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_last_updated(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -691,11 +691,11 @@ UPB_INLINE int32_t envoy_admin_v3_ListenersConfigDump_DynamicListener_client_sta UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_name(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_active_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -707,7 +707,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_warming_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -719,7 +719,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_draining_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -731,7 +731,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_error_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -743,7 +743,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ListenersCon } UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_client_status(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.ClustersConfigDump */ @@ -893,7 +893,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_ClustersConfigDump_dynamic_warming_cluster UPB_INLINE void envoy_admin_v3_ClustersConfigDump_set_version_info(envoy_admin_v3_ClustersConfigDump *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster** envoy_admin_v3_ClustersConfigDump_mutable_static_clusters(envoy_admin_v3_ClustersConfigDump* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1057,7 +1057,7 @@ UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_StaticCluster_has_last_updated UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_set_cluster(envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1069,7 +1069,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_StaticC } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_set_last_updated(envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1191,11 +1191,11 @@ UPB_INLINE int32_t envoy_admin_v3_ClustersConfigDump_DynamicCluster_client_statu UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_version_info(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_cluster(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1207,7 +1207,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_Dynamic } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_last_updated(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1219,7 +1219,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_D } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_error_state(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1231,7 +1231,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ClustersConf } UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_client_status(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.RoutesConfigDump */ @@ -1467,7 +1467,7 @@ UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_has_last_updat UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_route_config(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1479,7 +1479,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_StaticRou } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_last_updated(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1601,11 +1601,11 @@ UPB_INLINE int32_t envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_client_sta UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_version_info(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_route_config(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1617,7 +1617,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_DynamicRo } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_last_updated(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1629,7 +1629,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_Dyn } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_error_state(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1641,7 +1641,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_RoutesConfig } UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_client_status(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.ScopedRoutesConfigDump */ @@ -1905,7 +1905,7 @@ UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_h UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_set_name(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_mutable_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1939,7 +1939,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_Inl } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_set_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2089,11 +2089,11 @@ UPB_INLINE int32_t envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfi UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_name(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_version_info(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 48), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2127,7 +2127,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_Dyn } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2139,7 +2139,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDu } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_error_state(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2151,7 +2151,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ScopedRoutes } UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_client_status(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.EndpointsConfigDump */ @@ -2387,7 +2387,7 @@ UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_has_last UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_endpoint_config(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2399,7 +2399,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_Static } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_last_updated(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2521,11 +2521,11 @@ UPB_INLINE int32_t envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_clie UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_version_info(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_endpoint_config(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2537,7 +2537,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_Dynami } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_last_updated(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2549,7 +2549,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_ } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_error_state(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2561,7 +2561,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EndpointsCon } UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_client_status(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.admin.v3.EcdsConfigDump */ @@ -2775,11 +2775,11 @@ UPB_INLINE int32_t envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_client_status( UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_version_info(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_ecds_filter(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_ecds_filter(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_ecds_filter(msg); @@ -2791,7 +2791,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EcdsConfigDump_EcdsFilterC } UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_last_updated(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_last_updated(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_last_updated(msg); @@ -2803,7 +2803,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EcdsConfigDump_EcdsF } UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_error_state(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_mutable_error_state(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_error_state(msg); @@ -2815,7 +2815,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EcdsConfigDu } UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_client_status(envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c index e020a75bd8..9b6d0f47f2 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = { &envoy_admin_v3_UpdateFailureState_submsgs[0], &envoy_admin_v3_UpdateFailureState__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.UpdateFailureState", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -59,6 +62,9 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = { &envoy_admin_v3_ListenersConfigDump_submsgs[0], &envoy_admin_v3_ListenersConfigDump__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenersConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -81,6 +87,9 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_in &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0], &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenersConfigDump.StaticListener", +#endif }; static const upb_MiniTableSub envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = { @@ -98,6 +107,9 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_ &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0], &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenersConfigDump.DynamicListenerState", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -124,6 +136,9 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_i &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0], &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0], UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenersConfigDump.DynamicListener", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -153,6 +168,9 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = { &envoy_admin_v3_ClustersConfigDump_submsgs[0], &envoy_admin_v3_ClustersConfigDump__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ClustersConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -179,6 +197,9 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0], &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ClustersConfigDump.StaticCluster", +#endif }; static const upb_MiniTableSub envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = { @@ -199,6 +220,9 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_ini &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0], &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ClustersConfigDump.DynamicCluster", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -225,6 +249,9 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = { &envoy_admin_v3_RoutesConfigDump_submsgs[0], &envoy_admin_v3_RoutesConfigDump__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.RoutesConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -247,6 +274,9 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_in &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0], &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.RoutesConfigDump.StaticRouteConfig", +#endif }; static const upb_MiniTableSub envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = { @@ -267,6 +297,9 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_i &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0], &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.RoutesConfigDump.DynamicRouteConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -293,6 +326,9 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = { &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ScopedRoutesConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -316,6 +352,9 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteC &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ScopedRoutesConfigDump.InlineScopedRouteConfigs", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -343,6 +382,9 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRoute &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0], &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ScopedRoutesConfigDump.DynamicScopedRouteConfigs", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -369,6 +411,9 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = { &envoy_admin_v3_EndpointsConfigDump_submsgs[0], &envoy_admin_v3_EndpointsConfigDump__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EndpointsConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -391,6 +436,9 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_ &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0], &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EndpointsConfigDump.StaticEndpointConfig", +#endif }; static const upb_MiniTableSub envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = { @@ -411,6 +459,9 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0], &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EndpointsConfigDump.DynamicEndpointConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -435,6 +486,9 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = { &envoy_admin_v3_EcdsConfigDump_submsgs[0], &envoy_admin_v3_EcdsConfigDump__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EcdsConfigDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -459,6 +513,9 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[0], &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.EcdsConfigDump.EcdsFilterConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h index 9bafaab9bf..8cebc1fc44 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb.h @@ -209,7 +209,7 @@ UPB_INLINE upb_Array* _envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_tar UPB_INLINE void envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_set_name(envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_mutable_target_names(envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c index 31a0388de5..5eeb6def2e 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.c @@ -25,6 +25,9 @@ const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init = { &envoy_admin_v3_UnreadyTargetsDumps_submsgs[0], &envoy_admin_v3_UnreadyTargetsDumps__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.UnreadyTargetsDumps", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -40,6 +43,9 @@ const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_ms NULL, &envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.UnreadyTargetsDumps.UnreadyTargetsDump", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h index ef5f0ec647..59f1c051f4 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb.h @@ -228,11 +228,11 @@ UPB_INLINE upb_Array* _envoy_admin_v3_ListenerStatus_additional_local_addresses_ UPB_INLINE void envoy_admin_v3_ListenerStatus_set_name(envoy_admin_v3_ListenerStatus *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ListenerStatus_set_local_address(envoy_admin_v3_ListenerStatus *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_mutable_local_address(envoy_admin_v3_ListenerStatus* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_admin_v3_ListenerStatus_local_address(msg); diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c index 407d8d76eb..f6eaa9d79e 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__admin__v3__Listeners_msg_init = { &envoy_admin_v3_Listeners_submsgs[0], &envoy_admin_v3_Listeners__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Listeners", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -48,6 +51,9 @@ const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init = { &envoy_admin_v3_ListenerStatus_submsgs[0], &envoy_admin_v3_ListenerStatus__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ListenerStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h index a904ecd164..3cbf0f06a2 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb.h @@ -137,27 +137,27 @@ UPB_INLINE uint64_t envoy_admin_v3_Memory_total_physical_bytes(const envoy_admin UPB_INLINE void envoy_admin_v3_Memory_set_allocated(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_heap_size(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_pageheap_unmapped(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_pageheap_free(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {4, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_total_thread_cache(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {5, 40, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_Memory_set_total_physical_bytes(envoy_admin_v3_Memory *msg, uint64_t value) { const upb_MiniTableField field = {6, 48, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c index 303139c5b1..fd5e62e5ea 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__admin__v3__Memory_msg_init = { NULL, &envoy_admin_v3_Memory__fields[0], 56, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.Memory", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h index 2b7533da86..bd205011ce 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb.h @@ -106,15 +106,15 @@ UPB_INLINE upb_StringView envoy_admin_v3_SimpleMetric_name(const envoy_admin_v3_ UPB_INLINE void envoy_admin_v3_SimpleMetric_set_type(envoy_admin_v3_SimpleMetric *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SimpleMetric_set_value(envoy_admin_v3_SimpleMetric *msg, uint64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_SimpleMetric_set_name(envoy_admin_v3_SimpleMetric *msg, upb_StringView value) { const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c index 8a6d818a9d..0afd854374 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable envoy__admin__v3__SimpleMetric_msg_init = { NULL, &envoy_admin_v3_SimpleMetric__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.SimpleMetric", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h index 7942e73aef..1461a20247 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb.h @@ -101,15 +101,15 @@ UPB_INLINE uint64_t envoy_admin_v3_MutexStats_lifetime_wait_cycles(const envoy_a UPB_INLINE void envoy_admin_v3_MutexStats_set_num_contentions(envoy_admin_v3_MutexStats *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_MutexStats_set_current_wait_cycles(envoy_admin_v3_MutexStats *msg, uint64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_MutexStats_set_lifetime_wait_cycles(envoy_admin_v3_MutexStats *msg, uint64_t value) { const upb_MiniTableField field = {3, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c index a24ea9d3be..264eb93fba 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable envoy__admin__v3__MutexStats_msg_init = { NULL, &envoy_admin_v3_MutexStats__fields[0], 32, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.MutexStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h index 549214f5db..a7e7a7cad7 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb.h @@ -193,15 +193,15 @@ UPB_INLINE bool envoy_admin_v3_ServerInfo_has_node(const envoy_admin_v3_ServerIn UPB_INLINE void envoy_admin_v3_ServerInfo_set_version(envoy_admin_v3_ServerInfo *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ServerInfo_set_state(envoy_admin_v3_ServerInfo *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ServerInfo_set_uptime_current_epoch(envoy_admin_v3_ServerInfo *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_uptime_current_epoch(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_ServerInfo_uptime_current_epoch(msg); @@ -213,7 +213,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_up } UPB_INLINE void envoy_admin_v3_ServerInfo_set_uptime_all_epochs(envoy_admin_v3_ServerInfo *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_uptime_all_epochs(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_ServerInfo_uptime_all_epochs(msg); @@ -225,11 +225,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_ServerInfo_mutable_up } UPB_INLINE void envoy_admin_v3_ServerInfo_set_hot_restart_version(envoy_admin_v3_ServerInfo *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_ServerInfo_set_command_line_options(envoy_admin_v3_ServerInfo *msg, envoy_admin_v3_CommandLineOptions* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 64), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_CommandLineOptions* envoy_admin_v3_ServerInfo_mutable_command_line_options(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) { struct envoy_admin_v3_CommandLineOptions* sub = (struct envoy_admin_v3_CommandLineOptions*)envoy_admin_v3_ServerInfo_command_line_options(msg); @@ -241,7 +241,7 @@ UPB_INLINE struct envoy_admin_v3_CommandLineOptions* envoy_admin_v3_ServerInfo_m } UPB_INLINE void envoy_admin_v3_ServerInfo_set_node(envoy_admin_v3_ServerInfo *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 72), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_admin_v3_ServerInfo_mutable_node(envoy_admin_v3_ServerInfo* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_admin_v3_ServerInfo_node(msg); @@ -289,13 +289,13 @@ UPB_INLINE char* envoy_admin_v3_CommandLineOptions_serialize_ex(const envoy_admi return ptr; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_base_id(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(80, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(88, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_admin_v3_CommandLineOptions_base_id(const envoy_admin_v3_CommandLineOptions* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {1, UPB_SIZE(80, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(88, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -313,25 +313,25 @@ UPB_INLINE uint32_t envoy_admin_v3_CommandLineOptions_concurrency(const envoy_ad return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_config_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(88, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(96, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_config_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(88, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(96, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_config_yaml(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(96, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(104, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_config_yaml(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {4, UPB_SIZE(96, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(104, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -349,13 +349,13 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_allow_unknown_static_fields(co return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_admin_address_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {6, 104, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(112, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_admin_address_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {6, 104, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(112, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -373,85 +373,85 @@ UPB_INLINE int32_t envoy_admin_v3_CommandLineOptions_local_address_ip_version(co return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_log_level(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(112, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, 120, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_log_level(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {8, UPB_SIZE(112, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, 120, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_component_log_level(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(120, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(128, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_component_log_level(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {9, UPB_SIZE(120, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(128, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_log_format(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {10, UPB_SIZE(128, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {10, UPB_SIZE(136, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_log_format(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {10, UPB_SIZE(128, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {10, UPB_SIZE(136, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_log_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {11, UPB_SIZE(136, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(144, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_log_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {11, UPB_SIZE(136, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(144, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_service_cluster(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(144, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(152, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_service_cluster(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {13, UPB_SIZE(144, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(152, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_service_node(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {14, UPB_SIZE(152, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(160, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_service_node(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {14, UPB_SIZE(152, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(160, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_service_zone(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {15, UPB_SIZE(160, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(168, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_service_zone(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {15, UPB_SIZE(160, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(168, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -645,13 +645,13 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_use_dynamic_base_id(const envo return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_base_id_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {32, UPB_SIZE(168, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(176, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_base_id_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {32, UPB_SIZE(168, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(176, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -681,13 +681,13 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_enable_fine_grain_logging(cons return ret; } UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_socket_path(envoy_admin_v3_CommandLineOptions* msg) { - const upb_MiniTableField field = {35, UPB_SIZE(176, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(184, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_admin_v3_CommandLineOptions_socket_path(const envoy_admin_v3_CommandLineOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {35, UPB_SIZE(176, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(184, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -748,66 +748,90 @@ UPB_INLINE upb_Array* _envoy_admin_v3_CommandLineOptions_stats_tag_mutable_upb_a } return arr; } +UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_skip_hot_restart_on_no_parent(envoy_admin_v3_CommandLineOptions* msg) { + const upb_MiniTableField field = {39, UPB_SIZE(80, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_admin_v3_CommandLineOptions_skip_hot_restart_on_no_parent(const envoy_admin_v3_CommandLineOptions* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {39, UPB_SIZE(80, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_admin_v3_CommandLineOptions_clear_skip_hot_restart_parent_stats(envoy_admin_v3_CommandLineOptions* msg) { + const upb_MiniTableField field = {40, UPB_SIZE(81, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_admin_v3_CommandLineOptions_skip_hot_restart_parent_stats(const envoy_admin_v3_CommandLineOptions* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {40, UPB_SIZE(81, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_base_id(envoy_admin_v3_CommandLineOptions *msg, uint64_t value) { - const upb_MiniTableField field = {1, UPB_SIZE(80, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(88, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_concurrency(envoy_admin_v3_CommandLineOptions *msg, uint32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_config_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(88, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(96, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_config_yaml(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {4, UPB_SIZE(96, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(104, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_allow_unknown_static_fields(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {5, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_admin_address_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {6, 104, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {6, UPB_SIZE(112, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_local_address_ip_version(envoy_admin_v3_CommandLineOptions *msg, int32_t value) { const upb_MiniTableField field = {7, 20, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_log_level(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {8, UPB_SIZE(112, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, 120, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_component_log_level(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {9, UPB_SIZE(120, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {9, UPB_SIZE(128, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_log_format(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {10, UPB_SIZE(128, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {10, UPB_SIZE(136, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_log_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {11, UPB_SIZE(136, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {11, UPB_SIZE(144, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_service_cluster(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {13, UPB_SIZE(144, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {13, UPB_SIZE(152, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_service_node(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {14, UPB_SIZE(152, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {14, UPB_SIZE(160, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_service_zone(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {15, UPB_SIZE(160, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {15, UPB_SIZE(168, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_file_flush_interval(envoy_admin_v3_CommandLineOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {16, UPB_SIZE(24, 232), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_file_flush_interval(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_file_flush_interval(msg); @@ -819,7 +843,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mu } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_drain_time(envoy_admin_v3_CommandLineOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {17, UPB_SIZE(28, 240), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_drain_time(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_drain_time(msg); @@ -831,7 +855,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mu } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_parent_shutdown_time(envoy_admin_v3_CommandLineOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {18, UPB_SIZE(32, 248), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mutable_parent_shutdown_time(envoy_admin_v3_CommandLineOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_admin_v3_CommandLineOptions_parent_shutdown_time(msg); @@ -843,31 +867,31 @@ UPB_INLINE struct google_protobuf_Duration* envoy_admin_v3_CommandLineOptions_mu } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_mode(envoy_admin_v3_CommandLineOptions *msg, int32_t value) { const upb_MiniTableField field = {19, UPB_SIZE(36, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_disable_hot_restart(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {22, UPB_SIZE(40, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_enable_mutex_tracing(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {23, UPB_SIZE(41, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_restart_epoch(envoy_admin_v3_CommandLineOptions *msg, uint32_t value) { const upb_MiniTableField field = {24, UPB_SIZE(44, 32), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_cpuset_threads(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {25, UPB_SIZE(48, 36), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_reject_unknown_dynamic_fields(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {26, UPB_SIZE(49, 37), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_log_format_escaped(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {27, UPB_SIZE(50, 38), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_admin_v3_CommandLineOptions_mutable_disabled_extensions(envoy_admin_v3_CommandLineOptions* msg, size_t* size) { upb_MiniTableField field = {28, UPB_SIZE(52, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -899,35 +923,35 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_add_disabled_extensions(envoy_ } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_ignore_unknown_dynamic_fields(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {30, UPB_SIZE(56, 39), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_use_dynamic_base_id(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {31, UPB_SIZE(57, 40), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_base_id_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {32, UPB_SIZE(168, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {32, UPB_SIZE(176, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_drain_strategy(envoy_admin_v3_CommandLineOptions *msg, int32_t value) { const upb_MiniTableField field = {33, UPB_SIZE(60, 44), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_enable_fine_grain_logging(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {34, UPB_SIZE(64, 48), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_socket_path(envoy_admin_v3_CommandLineOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {35, UPB_SIZE(176, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {35, UPB_SIZE(184, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_socket_mode(envoy_admin_v3_CommandLineOptions *msg, uint32_t value) { const upb_MiniTableField field = {36, UPB_SIZE(68, 52), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_enable_core_dump(envoy_admin_v3_CommandLineOptions *msg, bool value) { const upb_MiniTableField field = {37, UPB_SIZE(72, 56), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_admin_v3_CommandLineOptions_mutable_stats_tag(envoy_admin_v3_CommandLineOptions* msg, size_t* size) { upb_MiniTableField field = {38, UPB_SIZE(76, 296), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -957,6 +981,14 @@ UPB_INLINE bool envoy_admin_v3_CommandLineOptions_add_stats_tag(envoy_admin_v3_C (arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val)); return true; } +UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_skip_hot_restart_on_no_parent(envoy_admin_v3_CommandLineOptions *msg, bool value) { + const upb_MiniTableField field = {39, UPB_SIZE(80, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_skip_hot_restart_parent_stats(envoy_admin_v3_CommandLineOptions *msg, bool value) { + const upb_MiniTableField field = {40, UPB_SIZE(81, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} #ifdef __cplusplus } /* extern "C" */ diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c index 269692be82..1bd4fa1ae7 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.c @@ -37,6 +37,9 @@ const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = { &envoy_admin_v3_ServerInfo_submsgs[0], &envoy_admin_v3_ServerInfo__fields[0], UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.ServerInfo", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -55,21 +58,21 @@ static const upb_MiniTableSub envoy_admin_v3_CommandLineOptions_submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, }; -static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[34] = { - {1, UPB_SIZE(80, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[36] = { + {1, UPB_SIZE(88, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(88, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(96, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(96, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(104, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {5, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {6, 104, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(112, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {7, 20, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(112, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {9, UPB_SIZE(120, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {10, UPB_SIZE(128, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {11, UPB_SIZE(136, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {13, UPB_SIZE(144, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {14, UPB_SIZE(152, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {15, UPB_SIZE(160, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {8, 120, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(128, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {10, UPB_SIZE(136, 152), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {11, UPB_SIZE(144, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(152, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {14, UPB_SIZE(160, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {15, UPB_SIZE(168, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {16, UPB_SIZE(24, 232), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {17, UPB_SIZE(28, 240), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {18, UPB_SIZE(32, 248), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -83,19 +86,24 @@ static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[34] = {28, UPB_SIZE(52, 256), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {30, UPB_SIZE(56, 39), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {31, UPB_SIZE(57, 40), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {32, UPB_SIZE(168, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {32, UPB_SIZE(176, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {33, UPB_SIZE(60, 44), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {34, UPB_SIZE(64, 48), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {35, UPB_SIZE(176, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {35, UPB_SIZE(184, 280), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {36, UPB_SIZE(68, 52), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {37, UPB_SIZE(72, 56), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {38, UPB_SIZE(76, 296), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {39, UPB_SIZE(80, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {40, UPB_SIZE(81, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init = { &envoy_admin_v3_CommandLineOptions_submsgs[0], &envoy_admin_v3_CommandLineOptions__fields[0], - UPB_SIZE(184, 304), 34, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(192, 304), 36, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.CommandLineOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x004000003f000008, &upb_psv8_1bt}, diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h index 81ab0879c0..d262247f6f 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb.h @@ -96,11 +96,11 @@ UPB_INLINE bool envoy_admin_v3_TapRequest_has_tap_config(const envoy_admin_v3_Ta UPB_INLINE void envoy_admin_v3_TapRequest_set_config_id(envoy_admin_v3_TapRequest *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_admin_v3_TapRequest_set_tap_config(envoy_admin_v3_TapRequest *msg, struct envoy_config_tap_v3_TapConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_TapConfig* envoy_admin_v3_TapRequest_mutable_tap_config(envoy_admin_v3_TapRequest* msg, upb_Arena* arena) { struct envoy_config_tap_v3_TapConfig* sub = (struct envoy_config_tap_v3_TapConfig*)envoy_admin_v3_TapRequest_tap_config(msg); diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c index 7c6da534cf..9f7117f066 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__admin__v3__TapRequest_msg_init = { &envoy_admin_v3_TapRequest_submsgs[0], &envoy_admin_v3_TapRequest__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.admin.v3.TapRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h index 9b20f40606..afaadfcff9 100644 --- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h +++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h @@ -46,7 +46,7 @@ UPB_INLINE void envoy_annotations_set_disallowed_by_default(struct google_protob UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool envoy_annotations_has_deprecated_at_minor_version(const struct google_protobuf_FieldOptions* msg) { @@ -70,7 +70,7 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version(struct google_ UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_StringView); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool envoy_annotations_has_disallowed_by_default_enum(const struct google_protobuf_EnumValueOptions* msg) { @@ -94,7 +94,7 @@ UPB_INLINE void envoy_annotations_set_disallowed_by_default_enum(struct google_p UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool envoy_annotations_has_deprecated_at_minor_version_enum(const struct google_protobuf_EnumValueOptions* msg) { @@ -118,7 +118,7 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version_enum(struct go UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_StringView); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb.h b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h index a3a1ef78e1..fd843799ad 100644 --- a/src/core/ext/upb-gen/envoy/annotations/resource.upb.h +++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h @@ -77,7 +77,7 @@ UPB_INLINE upb_StringView envoy_annotations_ResourceAnnotation_type(const envoy_ UPB_INLINE void envoy_annotations_ResourceAnnotation_set_type(envoy_annotations_ResourceAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool envoy_annotations_has_resource(const struct google_protobuf_ServiceOptions* msg) { @@ -101,9 +101,18 @@ UPB_INLINE void envoy_annotations_set_resource(struct google_protobuf_ServiceOpt UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct envoy_annotations_ResourceAnnotation* envoy_annotations_mutable_resource(struct google_protobuf_ServiceOptions* msg, + upb_Arena* arena) { + struct envoy_annotations_ResourceAnnotation* sub = (struct envoy_annotations_ResourceAnnotation*)envoy_annotations_resource(msg); + if (sub == NULL) { + sub = (struct envoy_annotations_ResourceAnnotation*)_upb_Message_New(&envoy__annotations__ResourceAnnotation_msg_init, arena); + if (sub) envoy_annotations_set_resource(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c index acfea01ac8..eaf425bb7e 100644 --- a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init = { NULL, &envoy_annotations_ResourceAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.annotations.ResourceAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h index e47bdf344d..fbc51acdb7 100644 --- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h +++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb.h @@ -173,11 +173,11 @@ UPB_INLINE bool envoy_config_accesslog_v3_AccessLog_has_typed_config(const envoy UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_name(envoy_config_accesslog_v3_AccessLog *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_filter(envoy_config_accesslog_v3_AccessLog *msg, envoy_config_accesslog_v3_AccessLogFilter* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_accesslog_v3_AccessLog_mutable_filter(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)envoy_config_accesslog_v3_AccessLog_filter(msg); @@ -189,7 +189,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_config_access } UPB_INLINE void envoy_config_accesslog_v3_AccessLog_set_typed_config(envoy_config_accesslog_v3_AccessLog *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_AccessLog_mutable_typed_config(envoy_config_accesslog_v3_AccessLog* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_AccessLog_typed_config(msg); @@ -468,7 +468,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_AccessLogFilter_has_log_type_filter(co UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_StatusCodeFilter* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_status_code_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_StatusCodeFilter* sub = (struct envoy_config_accesslog_v3_StatusCodeFilter*)envoy_config_accesslog_v3_AccessLogFilter_status_code_filter(msg); @@ -480,7 +480,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_StatusCodeFilter* envoy_config_acces } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_duration_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_DurationFilter* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_DurationFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_duration_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_DurationFilter* sub = (struct envoy_config_accesslog_v3_DurationFilter*)envoy_config_accesslog_v3_AccessLogFilter_duration_filter(msg); @@ -492,7 +492,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_DurationFilter* envoy_config_accessl } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_NotHealthCheckFilter* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_not_health_check_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_NotHealthCheckFilter* sub = (struct envoy_config_accesslog_v3_NotHealthCheckFilter*)envoy_config_accesslog_v3_AccessLogFilter_not_health_check_filter(msg); @@ -504,7 +504,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_NotHealthCheckFilter* envoy_config_a } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_TraceableFilter* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_TraceableFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_traceable_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_TraceableFilter* sub = (struct envoy_config_accesslog_v3_TraceableFilter*)envoy_config_accesslog_v3_AccessLogFilter_traceable_filter(msg); @@ -516,7 +516,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_TraceableFilter* envoy_config_access } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_RuntimeFilter* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_runtime_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_RuntimeFilter* sub = (struct envoy_config_accesslog_v3_RuntimeFilter*)envoy_config_accesslog_v3_AccessLogFilter_runtime_filter(msg); @@ -528,7 +528,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_RuntimeFilter* envoy_config_accesslo } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_and_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_AndFilter* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_and_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_AndFilter* sub = (struct envoy_config_accesslog_v3_AndFilter*)envoy_config_accesslog_v3_AccessLogFilter_and_filter(msg); @@ -540,7 +540,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AndFilter* envoy_config_accesslog_v3 } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_or_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_OrFilter* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_or_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_OrFilter* sub = (struct envoy_config_accesslog_v3_OrFilter*)envoy_config_accesslog_v3_AccessLogFilter_or_filter(msg); @@ -552,7 +552,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_OrFilter* envoy_config_accesslog_v3_ } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_header_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_HeaderFilter* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_header_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_HeaderFilter* sub = (struct envoy_config_accesslog_v3_HeaderFilter*)envoy_config_accesslog_v3_AccessLogFilter_header_filter(msg); @@ -564,7 +564,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_HeaderFilter* envoy_config_accesslog } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_ResponseFlagFilter* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_response_flag_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_ResponseFlagFilter* sub = (struct envoy_config_accesslog_v3_ResponseFlagFilter*)envoy_config_accesslog_v3_AccessLogFilter_response_flag_filter(msg); @@ -576,7 +576,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_ResponseFlagFilter* envoy_config_acc } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_GrpcStatusFilter* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_grpc_status_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_GrpcStatusFilter* sub = (struct envoy_config_accesslog_v3_GrpcStatusFilter*)envoy_config_accesslog_v3_AccessLogFilter_grpc_status_filter(msg); @@ -588,7 +588,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_GrpcStatusFilter* envoy_config_acces } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_extension_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_ExtensionFilter* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_ExtensionFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_extension_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_ExtensionFilter* sub = (struct envoy_config_accesslog_v3_ExtensionFilter*)envoy_config_accesslog_v3_AccessLogFilter_extension_filter(msg); @@ -600,7 +600,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_ExtensionFilter* envoy_config_access } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_MetadataFilter* value) { const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_MetadataFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_metadata_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_MetadataFilter* sub = (struct envoy_config_accesslog_v3_MetadataFilter*)envoy_config_accesslog_v3_AccessLogFilter_metadata_filter(msg); @@ -612,7 +612,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_MetadataFilter* envoy_config_accessl } UPB_INLINE void envoy_config_accesslog_v3_AccessLogFilter_set_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter *msg, envoy_config_accesslog_v3_LogTypeFilter* value) { const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_LogTypeFilter* envoy_config_accesslog_v3_AccessLogFilter_mutable_log_type_filter(envoy_config_accesslog_v3_AccessLogFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_LogTypeFilter* sub = (struct envoy_config_accesslog_v3_LogTypeFilter*)envoy_config_accesslog_v3_AccessLogFilter_log_type_filter(msg); @@ -690,11 +690,11 @@ UPB_INLINE bool envoy_config_accesslog_v3_ComparisonFilter_has_value(const envoy UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_op(envoy_config_accesslog_v3_ComparisonFilter *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_accesslog_v3_ComparisonFilter_set_value(envoy_config_accesslog_v3_ComparisonFilter *msg, struct envoy_config_core_v3_RuntimeUInt32* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeUInt32* envoy_config_accesslog_v3_ComparisonFilter_mutable_value(envoy_config_accesslog_v3_ComparisonFilter* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeUInt32* sub = (struct envoy_config_core_v3_RuntimeUInt32*)envoy_config_accesslog_v3_ComparisonFilter_value(msg); @@ -760,7 +760,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_StatusCodeFilter_has_comparison(const UPB_INLINE void envoy_config_accesslog_v3_StatusCodeFilter_set_comparison(envoy_config_accesslog_v3_StatusCodeFilter *msg, envoy_config_accesslog_v3_ComparisonFilter* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_StatusCodeFilter_mutable_comparison(envoy_config_accesslog_v3_StatusCodeFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_StatusCodeFilter_comparison(msg); @@ -826,7 +826,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_DurationFilter_has_comparison(const en UPB_INLINE void envoy_config_accesslog_v3_DurationFilter_set_comparison(envoy_config_accesslog_v3_DurationFilter *msg, envoy_config_accesslog_v3_ComparisonFilter* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_ComparisonFilter* envoy_config_accesslog_v3_DurationFilter_mutable_comparison(envoy_config_accesslog_v3_DurationFilter* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_ComparisonFilter* sub = (struct envoy_config_accesslog_v3_ComparisonFilter*)envoy_config_accesslog_v3_DurationFilter_comparison(msg); @@ -992,11 +992,11 @@ UPB_INLINE bool envoy_config_accesslog_v3_RuntimeFilter_use_independent_randomne UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_runtime_key(envoy_config_accesslog_v3_RuntimeFilter *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_RuntimeFilter_mutable_percent_sampled(envoy_config_accesslog_v3_RuntimeFilter* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_accesslog_v3_RuntimeFilter_percent_sampled(msg); @@ -1008,7 +1008,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_accesslog_v3_Run } UPB_INLINE void envoy_config_accesslog_v3_RuntimeFilter_set_use_independent_randomness(envoy_config_accesslog_v3_RuntimeFilter *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.accesslog.v3.AndFilter */ @@ -1266,7 +1266,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_HeaderFilter_has_header(const envoy_co UPB_INLINE void envoy_config_accesslog_v3_HeaderFilter_set_header(envoy_config_accesslog_v3_HeaderFilter *msg, struct envoy_config_route_v3_HeaderMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_accesslog_v3_HeaderFilter_mutable_header(envoy_config_accesslog_v3_HeaderFilter* msg, upb_Arena* arena) { struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_accesslog_v3_HeaderFilter_header(msg); @@ -1486,7 +1486,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_GrpcStatusFilter_add_statuses(envoy_co } UPB_INLINE void envoy_config_accesslog_v3_GrpcStatusFilter_set_exclude(envoy_config_accesslog_v3_GrpcStatusFilter *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.accesslog.v3.MetadataFilter */ @@ -1560,7 +1560,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_MetadataFilter_has_match_if_key_not_fo UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_matcher(envoy_config_accesslog_v3_MetadataFilter *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_v3_MetadataFilter_mutable_matcher(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_accesslog_v3_MetadataFilter_matcher(msg); @@ -1572,7 +1572,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_accesslog_ } UPB_INLINE void envoy_config_accesslog_v3_MetadataFilter_set_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_accesslog_v3_MetadataFilter_mutable_match_if_key_not_found(envoy_config_accesslog_v3_MetadataFilter* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_accesslog_v3_MetadataFilter_match_if_key_not_found(msg); @@ -1694,7 +1694,7 @@ UPB_INLINE bool envoy_config_accesslog_v3_LogTypeFilter_add_types(envoy_config_a } UPB_INLINE void envoy_config_accesslog_v3_LogTypeFilter_set_exclude(envoy_config_accesslog_v3_LogTypeFilter *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.accesslog.v3.ExtensionFilter */ @@ -1773,11 +1773,11 @@ UPB_INLINE bool envoy_config_accesslog_v3_ExtensionFilter_has_typed_config(const UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_name(envoy_config_accesslog_v3_ExtensionFilter *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_accesslog_v3_ExtensionFilter_set_typed_config(envoy_config_accesslog_v3_ExtensionFilter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter_mutable_typed_config(envoy_config_accesslog_v3_ExtensionFilter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_accesslog_v3_ExtensionFilter_typed_config(msg); diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c index db6a668580..12abdcaae9 100644 --- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.c @@ -37,6 +37,9 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = { &envoy_config_accesslog_v3_AccessLog_submsgs[0], &envoy_config_accesslog_v3_AccessLog__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.AccessLog", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -85,6 +88,9 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = { &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0], &envoy_config_accesslog_v3_AccessLogFilter__fields[0], UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.AccessLogFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -118,6 +124,9 @@ const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = { &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0], &envoy_config_accesslog_v3_ComparisonFilter__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.ComparisonFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -136,6 +145,9 @@ const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = { &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0], &envoy_config_accesslog_v3_StatusCodeFilter__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.StatusCodeFilter", +#endif }; static const upb_MiniTableSub envoy_config_accesslog_v3_DurationFilter_submsgs[1] = { @@ -150,18 +162,27 @@ const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init = { &envoy_config_accesslog_v3_DurationFilter_submsgs[0], &envoy_config_accesslog_v3_DurationFilter__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.DurationFilter", +#endif }; const upb_MiniTable envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.NotHealthCheckFilter", +#endif }; const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.TraceableFilter", +#endif }; static const upb_MiniTableSub envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = { @@ -178,6 +199,9 @@ const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = { &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0], &envoy_config_accesslog_v3_RuntimeFilter__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.RuntimeFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -198,6 +222,9 @@ const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = { &envoy_config_accesslog_v3_AndFilter_submsgs[0], &envoy_config_accesslog_v3_AndFilter__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.AndFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -216,6 +243,9 @@ const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = { &envoy_config_accesslog_v3_OrFilter_submsgs[0], &envoy_config_accesslog_v3_OrFilter__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.OrFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -236,6 +266,9 @@ const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init = { &envoy_config_accesslog_v3_HeaderFilter_submsgs[0], &envoy_config_accesslog_v3_HeaderFilter__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.HeaderFilter", +#endif }; static const upb_MiniTableField envoy_config_accesslog_v3_ResponseFlagFilter__fields[1] = { @@ -246,6 +279,9 @@ const upb_MiniTable envoy__config__accesslog__v3__ResponseFlagFilter_msg_init = NULL, &envoy_config_accesslog_v3_ResponseFlagFilter__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.ResponseFlagFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, @@ -261,6 +297,9 @@ const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init = { NULL, &envoy_config_accesslog_v3_GrpcStatusFilter__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.GrpcStatusFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_ppv4_1bt}, @@ -283,6 +322,9 @@ const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init = { &envoy_config_accesslog_v3_MetadataFilter_submsgs[0], &envoy_config_accesslog_v3_MetadataFilter__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.MetadataFilter", +#endif }; static const upb_MiniTableField envoy_config_accesslog_v3_LogTypeFilter__fields[2] = { @@ -294,6 +336,9 @@ const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init = { NULL, &envoy_config_accesslog_v3_LogTypeFilter__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.LogTypeFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_ppv4_1bt}, @@ -315,6 +360,9 @@ const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init = { &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0], &envoy_config_accesslog_v3_ExtensionFilter__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.accesslog.v3.ExtensionFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h index 98a285b79f..dab21d32bc 100644 --- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h +++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb.h @@ -66,6 +66,7 @@ typedef struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer { upb_Message U typedef struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer { upb_Message UPB_PRIVATE(base); } envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer; typedef struct envoy_config_bootstrap_v3_LayeredRuntime { upb_Message UPB_PRIVATE(base); } envoy_config_bootstrap_v3_LayeredRuntime; typedef struct envoy_config_bootstrap_v3_CustomInlineHeader { upb_Message UPB_PRIVATE(base); } envoy_config_bootstrap_v3_CustomInlineHeader; +typedef struct envoy_config_bootstrap_v3_MemoryAllocatorManager { upb_Message UPB_PRIVATE(base); } envoy_config_bootstrap_v3_MemoryAllocatorManager; struct envoy_config_accesslog_v3_AccessLog; struct envoy_config_cluster_v3_Cluster; struct envoy_config_core_v3_Address; @@ -146,92 +147,92 @@ typedef enum { 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) { - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return (envoy_config_bootstrap_v3_Bootstrap_stats_flush_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_node(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap_node(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_Node* default_val = NULL; const struct envoy_config_core_v3_Node* ret; - const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_node(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_static_resources(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_bootstrap_v3_Bootstrap_static_resources(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_StaticResources* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_StaticResources* ret; - const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_static_resources(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_dynamic_resources(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bootstrap_v3_Bootstrap_dynamic_resources(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* ret; - const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_dynamic_resources(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_cluster_manager(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_Bootstrap_cluster_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_ClusterManager* default_val = NULL; const envoy_config_bootstrap_v3_ClusterManager* ret; - const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_cluster_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_flags_path(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {5, UPB_SIZE(148, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, UPB_SIZE(156, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_flags_path(const envoy_config_bootstrap_v3_Bootstrap* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {5, UPB_SIZE(148, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, UPB_SIZE(156, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_sinks(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } 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* size) { - const upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -242,7 +243,7 @@ UPB_INLINE const struct envoy_config_metrics_v3_StatsSink* const* envoy_config_b } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -250,7 +251,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_upb return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -259,191 +260,191 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_stats_sinks_mutable_u return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_flush_interval(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_stats_flush_interval(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct google_protobuf_Duration* default_val = NULL; const struct google_protobuf_Duration* ret; - const upb_MiniTableField field = {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_flush_interval(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_watchdog(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Bootstrap_watchdog(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Watchdog* default_val = NULL; const envoy_config_bootstrap_v3_Watchdog* ret; - const upb_MiniTableField field = {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_watchdog(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_tracing(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Bootstrap_tracing(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_trace_v3_Tracing* default_val = NULL; const struct envoy_config_trace_v3_Tracing* ret; - const upb_MiniTableField field = {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_tracing(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_admin(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Bootstrap_admin(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Admin* default_val = NULL; const envoy_config_bootstrap_v3_Admin* ret; - const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_admin(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3_Bootstrap_stats_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_metrics_v3_StatsConfig* default_val = NULL; const struct envoy_config_metrics_v3_StatsConfig* ret; - const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_hds_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_hds_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_ApiConfigSource* default_val = NULL; const struct envoy_config_core_v3_ApiConfigSource* ret; - const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_hds_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_overload_manager(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_overload_v3_OverloadManager* envoy_config_bootstrap_v3_Bootstrap_overload_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_overload_v3_OverloadManager* default_val = NULL; const struct envoy_config_overload_v3_OverloadManager* ret; - const upb_MiniTableField field = {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_overload_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_enable_dispatcher_stats(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {16, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {16, UPB_SIZE(64, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_enable_dispatcher_stats(const envoy_config_bootstrap_v3_Bootstrap* msg) { bool default_val = false; bool ret; - const upb_MiniTableField field = {16, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {16, UPB_SIZE(64, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_layered_runtime(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_Bootstrap_layered_runtime(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_LayeredRuntime* default_val = NULL; const envoy_config_bootstrap_v3_LayeredRuntime* ret; - const upb_MiniTableField field = {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_layered_runtime(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_header_prefix(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {18, UPB_SIZE(156, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {18, UPB_SIZE(164, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_header_prefix(const envoy_config_bootstrap_v3_Bootstrap* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {18, UPB_SIZE(156, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {18, UPB_SIZE(164, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_server_version_override(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_Bootstrap_stats_server_version_override(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct google_protobuf_UInt64Value* default_val = NULL; const struct google_protobuf_UInt64Value* ret; - const upb_MiniTableField field = {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_server_version_override(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_use_tcp_for_dns_lookups(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {20, UPB_SIZE(72, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {20, UPB_SIZE(76, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_use_tcp_for_dns_lookups(const envoy_config_bootstrap_v3_Bootstrap* msg) { bool default_val = false; bool ret; - const upb_MiniTableField field = {20, UPB_SIZE(72, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {20, UPB_SIZE(76, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } 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* size) { - const upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -454,7 +455,7 @@ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_ } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_extensions_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -462,7 +463,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_exten return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_extensions_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -471,11 +472,11 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_bootstrap_extensions_ return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_config_sources(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } 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* size) { - const upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -486,7 +487,7 @@ UPB_INLINE const struct envoy_config_core_v3_ConfigSource* const* envoy_config_b } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -494,7 +495,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_ return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -503,68 +504,68 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_config_sources_mutabl return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_default_config_source(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_default_config_source(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_ConfigSource* default_val = NULL; const struct envoy_config_core_v3_ConfigSource* ret; - const upb_MiniTableField field = {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_default_config_source(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_default_socket_interface(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {24, UPB_SIZE(164, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {24, UPB_SIZE(172, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_default_socket_interface(const envoy_config_bootstrap_v3_Bootstrap* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {24, UPB_SIZE(164, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {24, UPB_SIZE(172, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_certificate_provider_instances(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE size_t envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_size(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); return map ? _upb_Map_Size(map) : 0; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_get(const envoy_config_bootstrap_v3_Bootstrap* msg, upb_StringView key, struct envoy_config_core_v3_TypedExtensionConfig** val) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Get(map, &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) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Map* map = upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry*)_upb_map_next(map, iter); } UPB_INLINE const upb_Map* _envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_upb_map(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_GetMap(UPB_UPCAST(msg), &field); } UPB_INLINE upb_Map* _envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_mutable_upb_map(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* a) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct envoy_config_core_v3_TypedExtensionConfig*), a); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_node_context_params(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView const* envoy_config_bootstrap_v3_Bootstrap_node_context_params(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -575,7 +576,7 @@ UPB_INLINE upb_StringView const* envoy_config_bootstrap_v3_Bootstrap_node_contex } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_node_context_params_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -583,7 +584,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_node_context_pa return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_node_context_params_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -592,27 +593,27 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_node_context_params_m return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_watchdogs(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Bootstrap_watchdogs(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Watchdogs* default_val = NULL; const envoy_config_bootstrap_v3_Watchdogs* ret; - const upb_MiniTableField field = {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_watchdogs(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_fatal_actions(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } 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* size) { - const upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -623,7 +624,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_FatalAction* const* envoy_config_boot } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -631,7 +632,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_u return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -640,59 +641,59 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_fatal_actions_mutable return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_stats_flush_on_admin(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_stats_flush_on_admin(const envoy_config_bootstrap_v3_Bootstrap* msg) { bool default_val = false; bool ret; - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_flush_on_admin(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_dns_resolution_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_bootstrap_v3_Bootstrap_dns_resolution_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_DnsResolutionConfig* default_val = NULL; const struct envoy_config_core_v3_DnsResolutionConfig* ret; - const upb_MiniTableField field = {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_dns_resolution_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_typed_dns_resolver_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_typed_dns_resolver_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_typed_dns_resolver_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_inline_headers(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_CustomInlineHeader* const* envoy_config_bootstrap_v3_Bootstrap_inline_headers(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -703,7 +704,7 @@ UPB_INLINE const envoy_config_bootstrap_v3_CustomInlineHeader* const* envoy_conf } } UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_upb_array(const envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - const upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -711,7 +712,7 @@ UPB_INLINE const upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_ return arr; } UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_mutable_upb_array(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -720,133 +721,149 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Bootstrap_inline_headers_mutabl return arr; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_perf_tracing_file_path(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {33, UPB_SIZE(172, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {33, UPB_SIZE(180, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_perf_tracing_file_path(const envoy_config_bootstrap_v3_Bootstrap* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {33, UPB_SIZE(172, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {33, UPB_SIZE(180, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_default_regex_engine(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_default_regex_engine(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_default_regex_engine(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_xds_delegate_extension(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_xds_delegate_extension(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_xds_delegate_extension(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_xds_config_tracker_extension(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_xds_config_tracker_extension(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_xds_config_tracker_extension(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_listener_manager(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_listener_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; const struct envoy_config_core_v3_TypedExtensionConfig* ret; - const upb_MiniTableField field = {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_listener_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_application_log_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_config_bootstrap_v3_Bootstrap_application_log_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* ret; - const upb_MiniTableField field = {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_application_log_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_deferred_stat_options(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* envoy_config_bootstrap_v3_Bootstrap_deferred_stat_options(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* ret; - const upb_MiniTableField field = {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_deferred_stat_options(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_grpc_async_client_manager_config(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* envoy_config_bootstrap_v3_Bootstrap_grpc_async_client_manager_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { const envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* default_val = NULL; const envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* ret; - const upb_MiniTableField field = {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_grpc_async_client_manager_config(const envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_clear_memory_allocator_manager(envoy_config_bootstrap_v3_Bootstrap* msg) { + const upb_MiniTableField field = {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_Bootstrap_memory_allocator_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { + const envoy_config_bootstrap_v3_MemoryAllocatorManager* default_val = NULL; + const envoy_config_bootstrap_v3_MemoryAllocatorManager* ret; + const upb_MiniTableField field = {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_memory_allocator_manager(const envoy_config_bootstrap_v3_Bootstrap* msg) { + const upb_MiniTableField field = {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_node(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_Node* value) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -857,8 +874,8 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap 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) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -869,8 +886,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_con 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) { - const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -881,8 +898,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_co 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) { - const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -893,11 +910,11 @@ UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_flags_path(envoy_config_bootstrap_v3_Bootstrap *msg, upb_StringView value) { - const upb_MiniTableField field = {5, UPB_SIZE(148, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {5, UPB_SIZE(156, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { - upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -908,12 +925,12 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsSink** envoy_config_bootstrap_v3_ } } UPB_INLINE struct envoy_config_metrics_v3_StatsSink** envoy_config_bootstrap_v3_Bootstrap_resize_stats_sinks(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (struct envoy_config_metrics_v3_StatsSink**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, 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) { - upb_MiniTableField field = {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -927,8 +944,8 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsSink* envoy_config_bootstrap_v3_B 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) { - const upb_MiniTableField field = {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -939,8 +956,8 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_ return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_watchdog(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Watchdog* value) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -951,8 +968,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_ 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) { - const upb_MiniTableField field = {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -963,8 +980,8 @@ UPB_INLINE struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Boots return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_admin(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Admin* value) { - const upb_MiniTableField field = {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -975,8 +992,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Boo 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) { - const upb_MiniTableField field = {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -987,8 +1004,8 @@ UPB_INLINE struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3 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) { - const upb_MiniTableField field = {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -999,8 +1016,8 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v 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) { - const upb_MiniTableField field = {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1011,12 +1028,12 @@ UPB_INLINE struct envoy_config_overload_v3_OverloadManager* envoy_config_bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_enable_dispatcher_stats(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { - const upb_MiniTableField field = {16, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {16, UPB_SIZE(64, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_layered_runtime(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_LayeredRuntime* value) { - const upb_MiniTableField field = {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1027,12 +1044,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_header_prefix(envoy_config_bootstrap_v3_Bootstrap *msg, upb_StringView value) { - const upb_MiniTableField field = {18, UPB_SIZE(156, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {18, UPB_SIZE(164, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { - const upb_MiniTableField field = {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1043,11 +1060,11 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_Bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_use_tcp_for_dns_lookups(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { - const upb_MiniTableField field = {20, UPB_SIZE(72, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {20, UPB_SIZE(76, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { - upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1058,12 +1075,12 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_boots } } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_bootstrap_v3_Bootstrap_resize_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (struct envoy_config_core_v3_TypedExtensionConfig**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, 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) { - upb_MiniTableField field = {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1077,7 +1094,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst 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* size) { - upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1088,12 +1105,12 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource** envoy_config_bootstrap_v3_ } } UPB_INLINE struct envoy_config_core_v3_ConfigSource** envoy_config_bootstrap_v3_Bootstrap_resize_config_sources(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (struct envoy_config_core_v3_ConfigSource**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, 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) { - upb_MiniTableField field = {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1107,8 +1124,8 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B 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) { - const upb_MiniTableField field = {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1119,36 +1136,36 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_socket_interface(envoy_config_bootstrap_v3_Bootstrap *msg, upb_StringView value) { - const upb_MiniTableField field = {24, UPB_SIZE(164, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {24, UPB_SIZE(172, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_clear(envoy_config_bootstrap_v3_Bootstrap* msg) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return; _upb_Map_Clear(map); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_set(envoy_config_bootstrap_v3_Bootstrap* msg, upb_StringView key, struct envoy_config_core_v3_TypedExtensionConfig* val, upb_Arena* a) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Map* map = _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(val), a); return _upb_Map_Insert(map, &key, 0, &val, sizeof(val), a) != kUpb_MapInsertStatus_OutOfMemory; } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_delete(envoy_config_bootstrap_v3_Bootstrap* msg, upb_StringView key) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return false; return _upb_Map_Delete(map, &key, 0, NULL); } 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) { - const upb_MiniTableField field = {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Map* map = (upb_Map*)upb_Message_GetMap(UPB_UPCAST(msg), &field); if (!map) return NULL; return (envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry*)_upb_map_next(map, iter); } UPB_INLINE upb_StringView* envoy_config_bootstrap_v3_Bootstrap_mutable_node_context_params(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1159,12 +1176,12 @@ UPB_INLINE upb_StringView* envoy_config_bootstrap_v3_Bootstrap_mutable_node_cont } } UPB_INLINE upb_StringView* envoy_config_bootstrap_v3_Bootstrap_resize_node_context_params(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_add_node_context_params(envoy_config_bootstrap_v3_Bootstrap* msg, upb_StringView val, upb_Arena* arena) { - upb_MiniTableField field = {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1176,8 +1193,8 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_add_node_context_params(envo return true; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_watchdogs(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Watchdogs* value) { - const upb_MiniTableField field = {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1188,7 +1205,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3 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* size) { - upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1199,12 +1216,12 @@ UPB_INLINE envoy_config_bootstrap_v3_FatalAction** envoy_config_bootstrap_v3_Boo } } UPB_INLINE envoy_config_bootstrap_v3_FatalAction** envoy_config_bootstrap_v3_Bootstrap_resize_fatal_actions(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_bootstrap_v3_FatalAction**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, 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) { - upb_MiniTableField field = {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1218,12 +1235,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_ return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_on_admin(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { - const upb_MiniTableField field = {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_dns_resolution_config(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_DnsResolutionConfig* value) { - const upb_MiniTableField field = {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_dns_resolution_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_DnsResolutionConfig* sub = (struct envoy_config_core_v3_DnsResolutionConfig*)envoy_config_bootstrap_v3_Bootstrap_dns_resolution_config(msg); @@ -1234,8 +1251,8 @@ UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_bootstr return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_typed_dns_resolver_config(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_typed_dns_resolver_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_typed_dns_resolver_config(msg); @@ -1246,7 +1263,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader** envoy_config_bootstrap_v3_Bootstrap_mutable_inline_headers(envoy_config_bootstrap_v3_Bootstrap* msg, size_t* size) { - upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -1257,12 +1274,12 @@ UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader** envoy_config_bootstrap } } UPB_INLINE envoy_config_bootstrap_v3_CustomInlineHeader** envoy_config_bootstrap_v3_Bootstrap_resize_inline_headers(envoy_config_bootstrap_v3_Bootstrap* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_bootstrap_v3_CustomInlineHeader**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_bootstrap_v3_Bootstrap_add_inline_headers(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { - upb_MiniTableField field = {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -1276,12 +1293,12 @@ UPB_INLINE struct envoy_config_bootstrap_v3_CustomInlineHeader* envoy_config_boo return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_perf_tracing_file_path(envoy_config_bootstrap_v3_Bootstrap *msg, upb_StringView value) { - const upb_MiniTableField field = {33, UPB_SIZE(172, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {33, UPB_SIZE(180, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_regex_engine(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_default_regex_engine(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_default_regex_engine(msg); @@ -1292,8 +1309,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_xds_delegate_extension(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_xds_delegate_extension(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_xds_delegate_extension(msg); @@ -1304,8 +1321,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_xds_config_tracker_extension(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_xds_config_tracker_extension(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_xds_config_tracker_extension(msg); @@ -1316,8 +1333,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_listener_manager(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - const upb_MiniTableField field = {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_listener_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Bootstrap_listener_manager(msg); @@ -1328,8 +1345,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_application_log_config(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* value) { - const upb_MiniTableField field = {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_application_log_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig*)envoy_config_bootstrap_v3_Bootstrap_application_log_config(msg); @@ -1340,8 +1357,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* envo return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_deferred_stat_options(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* value) { - const upb_MiniTableField field = {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* envoy_config_bootstrap_v3_Bootstrap_mutable_deferred_stat_options(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* sub = (struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions*)envoy_config_bootstrap_v3_Bootstrap_deferred_stat_options(msg); @@ -1352,8 +1369,8 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions* envoy return sub; } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_grpc_async_client_manager_config(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* value) { - const upb_MiniTableField field = {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_grpc_async_client_manager_config(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* sub = (struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig*)envoy_config_bootstrap_v3_Bootstrap_grpc_async_client_manager_config(msg); @@ -1363,6 +1380,18 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConf } return sub; } +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_memory_allocator_manager(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_MemoryAllocatorManager* value) { + const upb_MiniTableField field = {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_Bootstrap_mutable_memory_allocator_manager(envoy_config_bootstrap_v3_Bootstrap* msg, upb_Arena* arena) { + struct envoy_config_bootstrap_v3_MemoryAllocatorManager* sub = (struct envoy_config_bootstrap_v3_MemoryAllocatorManager*)envoy_config_bootstrap_v3_Bootstrap_memory_allocator_manager(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_MemoryAllocatorManager*)_upb_Message_New(&envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, arena); + if (sub) envoy_config_bootstrap_v3_Bootstrap_set_memory_allocator_manager(msg, sub); + } + return sub; +} /* envoy.config.bootstrap.v3.Bootstrap.StaticResources */ @@ -1699,7 +1728,7 @@ UPB_INLINE upb_StringView envoy_config_bootstrap_v3_Bootstrap_DynamicResources_c 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1711,7 +1740,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B } 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) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1723,7 +1752,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_B } 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) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1735,11 +1764,11 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_lds_resources_locator(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_resources_locator(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig */ @@ -1797,7 +1826,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_has_log UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_set_log_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig *msg, envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_mutable_log_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig* msg, upb_Arena* arena) { struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* sub = (struct envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat*)envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_log_format(msg); @@ -1889,7 +1918,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogForm UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_set_json_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_mutable_json_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_json_format(msg); @@ -1901,7 +1930,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Bootstrap_Ap } UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_set_text_format(envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.Bootstrap.DeferredStatOptions */ @@ -1955,7 +1984,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions_enable_d UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions_set_enable_deferred_creation_stats(envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.Bootstrap.GrpcAsyncClientManagerConfig */ @@ -2013,7 +2042,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_set_max_cached_entry_idle_duration(envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_mutable_max_cached_entry_idle_duration(envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_max_cached_entry_idle_duration(msg); @@ -2200,15 +2229,15 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Admin_ignore_global_conn_limit(const e UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_access_log_path(envoy_config_bootstrap_v3_Admin *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_profile_path(envoy_config_bootstrap_v3_Admin *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_address(envoy_config_bootstrap_v3_Admin *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2280,7 +2309,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_bootstrap_v3 } UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_ignore_global_conn_limit(envoy_config_bootstrap_v3_Admin *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.ClusterManager */ @@ -2394,11 +2423,11 @@ UPB_INLINE bool envoy_config_bootstrap_v3_ClusterManager_enable_deferred_cluster UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_local_cluster_name(envoy_config_bootstrap_v3_ClusterManager *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2410,7 +2439,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* env } 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) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2422,7 +2451,7 @@ UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_bootstrap_v3_Clu } 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) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2434,7 +2463,7 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v } UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_enable_deferred_cluster_creation(envoy_config_bootstrap_v3_ClusterManager *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.ClusterManager.OutlierDetection */ @@ -2504,11 +2533,11 @@ UPB_INLINE bool envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_has_ev UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_event_log_path(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2590,7 +2619,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Watchdogs_has_worker_watchdog(const en UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_set_main_thread_watchdog(envoy_config_bootstrap_v3_Watchdogs *msg, envoy_config_bootstrap_v3_Watchdog* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2602,7 +2631,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_ } UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_set_worker_watchdog(envoy_config_bootstrap_v3_Watchdogs *msg, envoy_config_bootstrap_v3_Watchdog* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2780,7 +2809,7 @@ UPB_INLINE upb_Array* _envoy_config_bootstrap_v3_Watchdog_actions_mutable_upb_ar UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_miss_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2792,7 +2821,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_megamiss_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2804,7 +2833,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_kill_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2816,7 +2845,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_multikill_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2828,7 +2857,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_m } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_multikill_threshold(envoy_config_bootstrap_v3_Watchdog *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2840,7 +2869,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_bootstrap_v3_Watchdog_muta } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_max_kill_timeout_jitter(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2948,7 +2977,7 @@ UPB_INLINE int32_t envoy_config_bootstrap_v3_Watchdog_WatchdogAction_event(const 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2960,7 +2989,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootst } UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_event(envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg, int32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.FatalAction */ @@ -3018,7 +3047,7 @@ UPB_INLINE bool envoy_config_bootstrap_v3_FatalAction_has_config(const envoy_con UPB_INLINE void envoy_config_bootstrap_v3_FatalAction_set_config(envoy_config_bootstrap_v3_FatalAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -3120,19 +3149,19 @@ UPB_INLINE bool envoy_config_bootstrap_v3_Runtime_has_base(const envoy_config_bo UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_symlink_root(envoy_config_bootstrap_v3_Runtime *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_subdirectory(envoy_config_bootstrap_v3_Runtime *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_override_subdirectory(envoy_config_bootstrap_v3_Runtime *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_base(envoy_config_bootstrap_v3_Runtime *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -3270,11 +3299,11 @@ UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_has_rtds_layer(const envo UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_name(envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_static_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -3286,7 +3315,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_RuntimeLayer } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_disk_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -3298,7 +3327,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_admin_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -3310,7 +3339,7 @@ UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_confi } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_rtds_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -3396,15 +3425,15 @@ UPB_INLINE upb_StringView envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_subdi UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_symlink_root(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_append_service_cluster(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, bool value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_subdirectory(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer */ @@ -3512,11 +3541,11 @@ UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_has_rtds_config UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_name(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -3690,11 +3719,93 @@ UPB_INLINE int32_t envoy_config_bootstrap_v3_CustomInlineHeader_inline_header_ty UPB_INLINE void envoy_config_bootstrap_v3_CustomInlineHeader_set_inline_header_name(envoy_config_bootstrap_v3_CustomInlineHeader *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_bootstrap_v3_CustomInlineHeader_set_inline_header_type(envoy_config_bootstrap_v3_CustomInlineHeader *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.bootstrap.v3.MemoryAllocatorManager */ + +UPB_INLINE envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_MemoryAllocatorManager_new(upb_Arena* arena) { + return (envoy_config_bootstrap_v3_MemoryAllocatorManager*)_upb_Message_New(&envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_MemoryAllocatorManager_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_bootstrap_v3_MemoryAllocatorManager* ret = envoy_config_bootstrap_v3_MemoryAllocatorManager_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_bootstrap_v3_MemoryAllocatorManager* envoy_config_bootstrap_v3_MemoryAllocatorManager_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_bootstrap_v3_MemoryAllocatorManager* ret = envoy_config_bootstrap_v3_MemoryAllocatorManager_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_bootstrap_v3_MemoryAllocatorManager_serialize(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_bootstrap_v3_MemoryAllocatorManager_serialize_ex(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_clear_bytes_to_release(envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_bootstrap_v3_MemoryAllocatorManager_bytes_to_release(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_clear_memory_release_interval(envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_MemoryAllocatorManager_memory_release_interval(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + const struct google_protobuf_Duration* default_val = NULL; + const struct google_protobuf_Duration* ret; + const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_bootstrap_v3_MemoryAllocatorManager_has_memory_release_interval(const envoy_config_bootstrap_v3_MemoryAllocatorManager* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_set_bytes_to_release(envoy_config_bootstrap_v3_MemoryAllocatorManager *msg, uint64_t value) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_bootstrap_v3_MemoryAllocatorManager_set_memory_release_interval(envoy_config_bootstrap_v3_MemoryAllocatorManager *msg, struct google_protobuf_Duration* value) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_MemoryAllocatorManager_mutable_memory_release_interval(envoy_config_bootstrap_v3_MemoryAllocatorManager* msg, upb_Arena* arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_MemoryAllocatorManager_memory_release_interval(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena); + if (sub) envoy_config_bootstrap_v3_MemoryAllocatorManager_set_memory_release_interval(msg, sub); + } + return sub; } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c index 0959ed0b7c..d0a5dd5181 100644 --- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.c @@ -36,7 +36,7 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[30] = { +static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[31] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init}, @@ -67,53 +67,58 @@ static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_submsgs[30] = {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init}, -}; - -static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[38] = { - {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {5, UPB_SIZE(148, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {6, UPB_SIZE(28, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {7, UPB_SIZE(32, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(36, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {9, UPB_SIZE(40, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {12, UPB_SIZE(44, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {13, UPB_SIZE(48, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {14, UPB_SIZE(52, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {15, UPB_SIZE(56, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {16, UPB_SIZE(60, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {17, UPB_SIZE(64, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {18, UPB_SIZE(156, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {19, UPB_SIZE(68, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {20, UPB_SIZE(72, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {21, UPB_SIZE(76, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {22, UPB_SIZE(80, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {23, UPB_SIZE(84, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {24, UPB_SIZE(164, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {25, UPB_SIZE(88, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {26, UPB_SIZE(92, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {27, UPB_SIZE(96, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {28, UPB_SIZE(100, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {29, 11, UPB_SIZE(-105, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {30, UPB_SIZE(108, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {31, UPB_SIZE(112, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {32, UPB_SIZE(116, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {33, UPB_SIZE(172, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {34, UPB_SIZE(120, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {35, UPB_SIZE(124, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {36, UPB_SIZE(128, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {37, UPB_SIZE(132, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {38, UPB_SIZE(136, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {39, UPB_SIZE(140, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {40, UPB_SIZE(144, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init}, +}; + +static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[39] = { + {1, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(156, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(32, 72), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {7, UPB_SIZE(36, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(40, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(44, 96), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {12, UPB_SIZE(48, 104), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(52, 112), 72, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {14, UPB_SIZE(56, 120), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {15, UPB_SIZE(60, 128), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {16, UPB_SIZE(64, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {17, UPB_SIZE(68, 136), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {18, UPB_SIZE(164, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {19, UPB_SIZE(72, 160), 76, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {20, UPB_SIZE(76, 14), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {21, UPB_SIZE(80, 168), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {22, UPB_SIZE(84, 176), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {23, UPB_SIZE(88, 184), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {24, UPB_SIZE(172, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {25, UPB_SIZE(92, 208), 0, 17, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {26, UPB_SIZE(96, 216), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {27, UPB_SIZE(100, 224), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {28, UPB_SIZE(104, 232), 0, 19, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {29, 12, UPB_SIZE(-109, -17), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {30, UPB_SIZE(112, 240), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {31, UPB_SIZE(116, 248), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {32, UPB_SIZE(120, 256), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {33, UPB_SIZE(180, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {34, UPB_SIZE(124, 280), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {35, UPB_SIZE(128, 288), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {36, UPB_SIZE(132, 296), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {37, UPB_SIZE(136, 304), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {38, UPB_SIZE(140, 312), 85, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {39, UPB_SIZE(144, 320), 86, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {40, UPB_SIZE(148, 328), 87, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {41, UPB_SIZE(152, 336), 88, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { &envoy_config_bootstrap_v3_Bootstrap_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap__fields[0], - UPB_SIZE(184, 336), 38, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(192, 344), 39, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -131,11 +136,11 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x000c00003f000180, &upb_psb1_2bt}, + {0x000d00003f000180, &upb_psb1_2bt}, {0x010800003f00028a, &upb_pss_2bt}, {0x009000003f000192, &upb_pss_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x000d00003f0001a0, &upb_psb1_2bt}, + {0x000e00003f0001a0, &upb_psb1_2bt}, {0x00a800003f0e01aa, &upb_prm_2bt_maxmaxb}, {0x00b000003f0f01b2, &upb_prm_2bt_maxmaxb}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -144,7 +149,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { {0x00d800003f0001d2, &upb_prs_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x00e800003f1301e2, &upb_prm_2bt_max64b}, - {0x000b00101d0001e8, &upb_pob1_2bt}, + {0x000c00101d0001e8, &upb_pob1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) @@ -166,6 +171,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.StaticResources", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -192,6 +200,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_ms &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[0], UPB_SIZE(40, 72), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.DynamicResources", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -216,6 +227,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfi &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = { @@ -231,6 +245,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfi &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.ApplicationLogConfig.LogFormat", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -247,6 +264,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions NULL, &envoy_config_bootstrap_v3_Bootstrap_DeferredStatOptions__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.DeferredStatOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -265,6 +285,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientMana &envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.GrpcAsyncClientManagerConfig", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = { @@ -280,6 +303,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProvider &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0], &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -305,6 +331,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = { &envoy_config_bootstrap_v3_Admin_submsgs[0], &envoy_config_bootstrap_v3_Admin__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Admin", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -335,6 +364,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = { &envoy_config_bootstrap_v3_ClusterManager_submsgs[0], &envoy_config_bootstrap_v3_ClusterManager__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.ClusterManager", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -360,6 +392,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetecti &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0], &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.ClusterManager.OutlierDetection", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -380,6 +415,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = { &envoy_config_bootstrap_v3_Watchdogs_submsgs[0], &envoy_config_bootstrap_v3_Watchdogs__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Watchdogs", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_Watchdog_submsgs[7] = { @@ -406,6 +444,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = { &envoy_config_bootstrap_v3_Watchdog_submsgs[0], &envoy_config_bootstrap_v3_Watchdog__fields[0], UPB_SIZE(40, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Watchdog", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -431,6 +472,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_i &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0], &envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Watchdog.WatchdogAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -451,6 +495,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = { &envoy_config_bootstrap_v3_FatalAction_submsgs[0], &envoy_config_bootstrap_v3_FatalAction__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.FatalAction", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_Runtime_submsgs[1] = { @@ -468,6 +515,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = { &envoy_config_bootstrap_v3_Runtime_submsgs[0], &envoy_config_bootstrap_v3_Runtime__fields[0], UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.Runtime", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -495,6 +545,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init = { &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0], &envoy_config_bootstrap_v3_RuntimeLayer__fields[0], UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.RuntimeLayer", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -517,6 +570,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_in NULL, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -529,6 +585,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_i NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer", +#endif }; static const upb_MiniTableSub envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = { @@ -544,6 +603,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_in &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0], &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -562,6 +624,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init = { &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0], &envoy_config_bootstrap_v3_LayeredRuntime__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.LayeredRuntime", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -577,6 +642,9 @@ const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init = NULL, &envoy_config_bootstrap_v3_CustomInlineHeader__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.CustomInlineHeader", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -585,7 +653,29 @@ const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init = }) }; -static const upb_MiniTable *messages_layout[22] = { +static const upb_MiniTableSub envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +}; + +static const upb_MiniTableField envoy_config_bootstrap_v3_MemoryAllocatorManager__fields[2] = { + {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init = { + &envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[0], + &envoy_config_bootstrap_v3_MemoryAllocatorManager__fields[0], + UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.bootstrap.v3.MemoryAllocatorManager", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000003f000008, &upb_psv8_1bt}, + }) +}; + +static const upb_MiniTable *messages_layout[23] = { &envoy__config__bootstrap__v3__Bootstrap_msg_init, &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init, &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init, @@ -608,13 +698,14 @@ static const upb_MiniTable *messages_layout[22] = { &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init, &envoy__config__bootstrap__v3__LayeredRuntime_msg_init, &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init, + &envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init, }; const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout = { messages_layout, NULL, NULL, - 22, + 23, 0, 0, }; diff --git a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h index 0bce61ac6b..dbfa51694c 100644 --- a/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/bootstrap/v3/bootstrap.upb_minitable.h @@ -39,6 +39,7 @@ extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLaye extern const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init; extern const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init; extern const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init; +extern const upb_MiniTable envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init; extern const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h index b0fe445e28..76cfcddac0 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb.h @@ -355,11 +355,11 @@ UPB_INLINE bool envoy_config_cluster_v3_CircuitBreakers_Thresholds_has_retry_bud UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_priority(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_connections(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_connections(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_connections(msg); @@ -371,7 +371,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_pending_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_pending_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_pending_requests(msg); @@ -383,7 +383,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_requests(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_requests(msg); @@ -395,7 +395,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_retries(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_retries(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_retries(msg); @@ -407,11 +407,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_track_remaining(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_max_connection_pools(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 56), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_max_connection_pools(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_max_connection_pools(msg); @@ -423,7 +423,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_set_retry_budget(envoy_config_cluster_v3_CircuitBreakers_Thresholds *msg, envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 64), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* envoy_config_cluster_v3_CircuitBreakers_Thresholds_mutable_retry_budget(envoy_config_cluster_v3_CircuitBreakers_Thresholds* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* sub = (struct envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_retry_budget(msg); @@ -505,7 +505,7 @@ UPB_INLINE bool envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_h UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_set_budget_percent(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_mutable_budget_percent(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_budget_percent(msg); @@ -517,7 +517,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_CircuitBreakers } UPB_INLINE void envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_set_min_retry_concurrency(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_mutable_min_retry_concurrency(envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_min_retry_concurrency(msg); diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c index 567fbb039f..8cca6f747f 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = { &envoy_config_cluster_v3_CircuitBreakers_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.CircuitBreakers", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -64,6 +67,9 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_ &envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers_Thresholds__fields[0], UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.CircuitBreakers.Thresholds", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -90,6 +96,9 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__Ret &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[0], &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.CircuitBreakers.Thresholds.RetryBudget", +#endif }; static const upb_MiniTable *messages_layout[3] = { diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h index bb010b0876..fbf094cd6c 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb.h @@ -67,6 +67,7 @@ typedef struct envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntr typedef struct envoy_config_cluster_v3_LoadBalancingPolicy { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_LoadBalancingPolicy; typedef struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_LoadBalancingPolicy_Policy; typedef struct envoy_config_cluster_v3_UpstreamConnectionOptions { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_UpstreamConnectionOptions; +typedef struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig; typedef struct envoy_config_cluster_v3_TrackClusterStats { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_TrackClusterStats; struct envoy_config_cluster_v3_CircuitBreakers; struct envoy_config_cluster_v3_Filter; @@ -153,6 +154,12 @@ typedef enum { envoy_config_cluster_v3_Cluster_RingHashLbConfig_MURMUR_HASH_2 = 1 } envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction; +typedef enum { + envoy_config_cluster_v3_UpstreamConnectionOptions_DEFAULT = 0, + envoy_config_cluster_v3_UpstreamConnectionOptions_V4 = 1, + envoy_config_cluster_v3_UpstreamConnectionOptions_V6 = 2 +} envoy_config_cluster_v3_UpstreamConnectionOptions_FirstAddressFamilyVersion; + /* envoy.config.cluster.v3.ClusterCollection */ @@ -210,7 +217,7 @@ UPB_INLINE bool envoy_config_cluster_v3_ClusterCollection_has_entries(const envo UPB_INLINE void envoy_config_cluster_v3_ClusterCollection_set_entries(envoy_config_cluster_v3_ClusterCollection *msg, struct xds_core_v3_CollectionEntry* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -263,7 +270,7 @@ typedef enum { envoy_config_cluster_v3_Cluster_cluster_discovery_type_NOT_SET = 0 } envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases; UPB_INLINE envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases envoy_config_cluster_v3_Cluster_cluster_discovery_type_case(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return (envoy_config_cluster_v3_Cluster_cluster_discovery_type_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -276,36 +283,36 @@ typedef enum { envoy_config_cluster_v3_Cluster_lb_config_NOT_SET = 0 } envoy_config_cluster_v3_Cluster_lb_config_oneofcases; UPB_INLINE envoy_config_cluster_v3_Cluster_lb_config_oneofcases envoy_config_cluster_v3_Cluster_lb_config_case(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_cluster_v3_Cluster_lb_config_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_name(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(192, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(196, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_name(const envoy_config_cluster_v3_Cluster* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(192, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(196, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_type(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_type(const envoy_config_cluster_v3_Cluster* msg) { int32_t default_val = 0; int32_t ret; - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_type(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_eds_cluster_config(envoy_config_cluster_v3_Cluster* msg) { @@ -589,19 +596,19 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_lb_subset_config(const envoy return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_ring_hash_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_ring_hash_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_RingHashLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_RingHashLbConfig* ret; - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_ring_hash_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_transport_socket(envoy_config_cluster_v3_Cluster* msg) { @@ -665,13 +672,13 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_common_lb_config(const envoy return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_alt_stat_name(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {28, UPB_SIZE(200, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(204, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_alt_stat_name(const envoy_config_cluster_v3_Cluster* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {28, UPB_SIZE(200, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(204, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -749,19 +756,19 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_load_assignment(const envoy_ return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_original_dst_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_original_dst_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* ret; - const upb_MiniTableField field = {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_original_dst_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_typed_extension_protocol_options(envoy_config_cluster_v3_Cluster* msg) { @@ -794,35 +801,35 @@ UPB_INLINE upb_Map* _envoy_config_cluster_v3_Cluster_typed_extension_protocol_op return _upb_Message_GetOrCreateMutableMap(UPB_UPCAST(msg), &field, 0, sizeof(struct google_protobuf_Any*), a); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_least_request_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_least_request_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* ret; - const upb_MiniTableField field = {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_least_request_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_cluster_type(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_cluster_type(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_CustomClusterType* default_val = NULL; const envoy_config_cluster_v3_Cluster_CustomClusterType* ret; - const upb_MiniTableField field = {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_cluster_type(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_respect_dns_ttl(envoy_config_cluster_v3_Cluster* msg) { @@ -1050,19 +1057,19 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_connection_pool_per_downstream_c return ret; } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_maglev_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_maglev_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_MaglevLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_MaglevLbConfig* ret; - const upb_MiniTableField field = {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_maglev_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_dns_resolution_config(envoy_config_cluster_v3_Cluster* msg) { @@ -1114,33 +1121,65 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_typed_dns_resolver_config(co return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_round_robin_lb_config(envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_round_robin_lb_config(const envoy_config_cluster_v3_Cluster* msg) { const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* default_val = NULL; const envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* ret; - const upb_MiniTableField field = {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_round_robin_lb_config(const envoy_config_cluster_v3_Cluster* msg) { - const upb_MiniTableField field = {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_cluster_v3_Cluster_clear_lrs_report_endpoint_metrics(envoy_config_cluster_v3_Cluster* msg) { + const upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView const* envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { + const upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (upb_StringView const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics_upb_array(const envoy_config_cluster_v3_Cluster* msg, size_t* size) { + const upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics_mutable_upb_array(envoy_config_cluster_v3_Cluster* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} UPB_INLINE void envoy_config_cluster_v3_Cluster_set_name(envoy_config_cluster_v3_Cluster *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(192, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(196, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_type(envoy_config_cluster_v3_Cluster *msg, int32_t value) { - const upb_MiniTableField field = {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_eds_cluster_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_EdsClusterConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config_cluster_v3_Cluster_mutable_eds_cluster_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* sub = (struct envoy_config_cluster_v3_Cluster_EdsClusterConfig*)envoy_config_cluster_v3_Cluster_eds_cluster_config(msg); @@ -1152,7 +1191,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_EdsClusterConfig* envoy_config } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connect_timeout(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 64), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_connect_timeout(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_connect_timeout(msg); @@ -1164,7 +1203,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_muta } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 72), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_mutable_per_connection_buffer_limit_bytes(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_per_connection_buffer_limit_bytes(msg); @@ -1176,7 +1215,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_m } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_policy(envoy_config_cluster_v3_Cluster *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck** envoy_config_cluster_v3_Cluster_mutable_health_checks(envoy_config_cluster_v3_Cluster* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(28, 80), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1210,7 +1249,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck* envoy_config_cluster_v3_Clus } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_max_requests_per_connection(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {9, UPB_SIZE(32, 88), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_mutable_max_requests_per_connection(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_max_requests_per_connection(msg); @@ -1222,7 +1261,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_m } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_circuit_breakers(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_cluster_v3_CircuitBreakers* value) { const upb_MiniTableField field = {10, UPB_SIZE(36, 96), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_v3_Cluster_mutable_circuit_breakers(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_CircuitBreakers* sub = (struct envoy_config_cluster_v3_CircuitBreakers*)envoy_config_cluster_v3_Cluster_circuit_breakers(msg); @@ -1234,7 +1273,7 @@ UPB_INLINE struct envoy_config_cluster_v3_CircuitBreakers* envoy_config_cluster_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {13, UPB_SIZE(40, 104), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_config_cluster_v3_Cluster_http_protocol_options(msg); @@ -1246,7 +1285,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_config_cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_http2_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {14, UPB_SIZE(44, 112), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_http2_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_config_cluster_v3_Cluster_http2_protocol_options(msg); @@ -1258,7 +1297,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_refresh_rate(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {16, UPB_SIZE(48, 120), 71, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_dns_refresh_rate(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_dns_refresh_rate(msg); @@ -1270,7 +1309,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_muta } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_lookup_family(envoy_config_cluster_v3_Cluster *msg, int32_t value) { const upb_MiniTableField field = {17, UPB_SIZE(52, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address** envoy_config_cluster_v3_Cluster_mutable_dns_resolvers(envoy_config_cluster_v3_Cluster* msg, size_t* size) { upb_MiniTableField field = {18, UPB_SIZE(56, 128), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1304,7 +1343,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_cluster_v3_Cluster_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_outlier_detection(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_cluster_v3_OutlierDetection* value) { const upb_MiniTableField field = {19, UPB_SIZE(60, 136), 72, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster_v3_Cluster_mutable_outlier_detection(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_OutlierDetection* sub = (struct envoy_config_cluster_v3_OutlierDetection*)envoy_config_cluster_v3_Cluster_outlier_detection(msg); @@ -1316,7 +1355,7 @@ UPB_INLINE struct envoy_config_cluster_v3_OutlierDetection* envoy_config_cluster } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_cleanup_interval(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {20, UPB_SIZE(64, 144), 73, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_mutable_cleanup_interval(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_cleanup_interval(msg); @@ -1328,7 +1367,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_muta } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_bind_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_BindConfig* value) { const upb_MiniTableField field = {21, UPB_SIZE(68, 152), 74, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3_Cluster_mutable_upstream_bind_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_BindConfig* sub = (struct envoy_config_core_v3_BindConfig*)envoy_config_cluster_v3_Cluster_upstream_bind_config(msg); @@ -1340,7 +1379,7 @@ UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_cluster_v3_Clust } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lb_subset_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_LbSubsetConfig* value) { const upb_MiniTableField field = {22, UPB_SIZE(72, 160), 75, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_cluster_v3_Cluster_mutable_lb_subset_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* sub = (struct envoy_config_cluster_v3_Cluster_LbSubsetConfig*)envoy_config_cluster_v3_Cluster_lb_subset_config(msg); @@ -1351,8 +1390,8 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig* envoy_config_c return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ring_hash_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RingHashLbConfig* value) { - const upb_MiniTableField field = {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config_cluster_v3_Cluster_mutable_ring_hash_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_RingHashLbConfig*)envoy_config_cluster_v3_Cluster_ring_hash_lb_config(msg); @@ -1364,7 +1403,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_RingHashLbConfig* envoy_config } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_transport_socket(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TransportSocket* value) { const upb_MiniTableField field = {24, UPB_SIZE(76, 168), 76, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_mutable_transport_socket(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_cluster_v3_Cluster_transport_socket(msg); @@ -1376,7 +1415,7 @@ UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_metadata(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {25, UPB_SIZE(80, 176), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_Cluster_mutable_metadata(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_cluster_v3_Cluster_metadata(msg); @@ -1388,11 +1427,11 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_cluster_v3_Cluster } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_protocol_selection(envoy_config_cluster_v3_Cluster *msg, int32_t value) { const upb_MiniTableField field = {26, UPB_SIZE(84, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_common_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig* value) { const upb_MiniTableField field = {27, UPB_SIZE(88, 184), 78, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_cluster_v3_Cluster_mutable_common_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CommonLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig*)envoy_config_cluster_v3_Cluster_common_lb_config(msg); @@ -1403,12 +1442,12 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig* envoy_config_c return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_alt_stat_name(envoy_config_cluster_v3_Cluster *msg, upb_StringView value) { - const upb_MiniTableField field = {28, UPB_SIZE(200, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {28, UPB_SIZE(204, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_common_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_HttpProtocolOptions* value) { const upb_MiniTableField field = {29, UPB_SIZE(92, 208), 79, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_common_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_config_cluster_v3_Cluster_common_http_protocol_options(msg); @@ -1420,7 +1459,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_config_cluster } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_connection_options(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_UpstreamConnectionOptions* value) { const upb_MiniTableField field = {30, UPB_SIZE(96, 216), 80, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_config_cluster_v3_Cluster_mutable_upstream_connection_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_UpstreamConnectionOptions* sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions*)envoy_config_cluster_v3_Cluster_upstream_connection_options(msg); @@ -1432,15 +1471,15 @@ UPB_INLINE struct envoy_config_cluster_v3_UpstreamConnectionOptions* envoy_confi } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_close_connections_on_host_health_failure(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {31, UPB_SIZE(100, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_ignore_health_on_host_removal(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {32, UPB_SIZE(101, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_load_assignment(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_endpoint_v3_ClusterLoadAssignment* value) { const upb_MiniTableField field = {33, UPB_SIZE(104, 224), 81, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_cluster_v3_Cluster_mutable_load_assignment(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_ClusterLoadAssignment* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment*)envoy_config_cluster_v3_Cluster_load_assignment(msg); @@ -1451,8 +1490,8 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment* envoy_config_c return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_original_dst_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* value) { - const upb_MiniTableField field = {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* envoy_config_cluster_v3_Cluster_mutable_original_dst_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_OriginalDstLbConfig*)envoy_config_cluster_v3_Cluster_original_dst_lb_config(msg); @@ -1488,8 +1527,8 @@ UPB_INLINE envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry* e return (envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry*)_upb_map_next(map, iter); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_least_request_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* value) { - const upb_MiniTableField field = {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_config_cluster_v3_Cluster_mutable_least_request_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig*)envoy_config_cluster_v3_Cluster_least_request_lb_config(msg); @@ -1500,8 +1539,8 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* envoy_co return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_cluster_type(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_CustomClusterType* value) { - const upb_MiniTableField field = {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_config_cluster_v3_Cluster_mutable_cluster_type(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CustomClusterType* sub = (struct envoy_config_cluster_v3_Cluster_CustomClusterType*)envoy_config_cluster_v3_Cluster_cluster_type(msg); @@ -1513,7 +1552,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CustomClusterType* envoy_confi } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_respect_dns_ttl(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {39, UPB_SIZE(116, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Filter** envoy_config_cluster_v3_Cluster_mutable_filters(envoy_config_cluster_v3_Cluster* msg, size_t* size) { upb_MiniTableField field = {40, UPB_SIZE(120, 240), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1547,7 +1586,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Filter* envoy_config_cluster_v3_Cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_load_balancing_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_LoadBalancingPolicy* value) { const upb_MiniTableField field = {41, UPB_SIZE(124, 248), 82, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_cluster_v3_Cluster_mutable_load_balancing_policy(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_LoadBalancingPolicy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)envoy_config_cluster_v3_Cluster_load_balancing_policy(msg); @@ -1559,7 +1598,7 @@ UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_config_clus } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_lrs_server(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {42, UPB_SIZE(128, 256), 83, 27, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_mutable_lrs_server(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_cluster_v3_Cluster_lrs_server(msg); @@ -1601,7 +1640,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_TransportSocketMatch* envoy_co } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RefreshRate* value) { const upb_MiniTableField field = {44, UPB_SIZE(136, 272), 84, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_cluster_v3_Cluster_mutable_dns_failure_refresh_rate(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_RefreshRate* sub = (struct envoy_config_cluster_v3_Cluster_RefreshRate*)envoy_config_cluster_v3_Cluster_dns_failure_refresh_rate(msg); @@ -1613,11 +1652,11 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_RefreshRate* envoy_config_clus } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_use_tcp_for_dns_lookups(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {45, UPB_SIZE(140, 33), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_UpstreamHttpProtocolOptions* value) { const upb_MiniTableField field = {46, UPB_SIZE(144, 280), 85, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config_cluster_v3_Cluster_mutable_upstream_http_protocol_options(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_UpstreamHttpProtocolOptions* sub = (struct envoy_config_core_v3_UpstreamHttpProtocolOptions*)envoy_config_cluster_v3_Cluster_upstream_http_protocol_options(msg); @@ -1629,11 +1668,11 @@ UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_config } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_timeout_budgets(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {47, UPB_SIZE(148, 34), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_upstream_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {48, UPB_SIZE(152, 288), 86, 31, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_mutable_upstream_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_Cluster_upstream_config(msg); @@ -1645,7 +1684,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_track_cluster_stats(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_TrackClusterStats* value) { const upb_MiniTableField field = {49, UPB_SIZE(156, 296), 87, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_Cluster_mutable_track_cluster_stats(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_TrackClusterStats* sub = (struct envoy_config_cluster_v3_TrackClusterStats*)envoy_config_cluster_v3_Cluster_track_cluster_stats(msg); @@ -1657,7 +1696,7 @@ UPB_INLINE struct envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluste } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_preconnect_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_PreconnectPolicy* value) { const upb_MiniTableField field = {50, UPB_SIZE(160, 304), 88, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -1669,11 +1708,11 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_connection_pool_per_downstream_connection(envoy_config_cluster_v3_Cluster *msg, bool value) { const upb_MiniTableField field = {51, UPB_SIZE(164, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_maglev_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_MaglevLbConfig* value) { - const upb_MiniTableField field = {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_mutable_maglev_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_MaglevLbConfig*)envoy_config_cluster_v3_Cluster_maglev_lb_config(msg); @@ -1685,7 +1724,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_c } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_dns_resolution_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_DnsResolutionConfig* value) { const upb_MiniTableField field = {53, UPB_SIZE(168, 312), 89, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_cluster_v3_Cluster_mutable_dns_resolution_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_DnsResolutionConfig* sub = (struct envoy_config_core_v3_DnsResolutionConfig*)envoy_config_cluster_v3_Cluster_dns_resolution_config(msg); @@ -1697,7 +1736,7 @@ UPB_INLINE struct envoy_config_core_v3_DnsResolutionConfig* envoy_config_cluster } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {54, UPB_SIZE(172, 320), 90, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_Cluster_mutable_wait_for_warm_on_init(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_cluster_v3_Cluster_wait_for_warm_on_init(msg); @@ -1709,7 +1748,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_Cluster_mut } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {55, UPB_SIZE(176, 328), 91, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_mutable_typed_dns_resolver_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_Cluster_typed_dns_resolver_config(msg); @@ -1720,8 +1759,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluste return sub; } UPB_INLINE void envoy_config_cluster_v3_Cluster_set_round_robin_lb_config(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* value) { - const upb_MiniTableField field = {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_config_cluster_v3_Cluster_mutable_round_robin_lb_config(envoy_config_cluster_v3_Cluster* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig*)envoy_config_cluster_v3_Cluster_round_robin_lb_config(msg); @@ -1731,6 +1770,34 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* envoy_conf } return sub; } +UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_mutable_lrs_report_endpoint_metrics(envoy_config_cluster_v3_Cluster* msg, size_t* size) { + upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (upb_StringView*)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_resize_lrs_report_endpoint_metrics(envoy_config_cluster_v3_Cluster* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (upb_StringView*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE bool envoy_config_cluster_v3_Cluster_add_lrs_report_endpoint_metrics(envoy_config_cluster_v3_Cluster* msg, upb_StringView val, upb_Arena* arena) { + upb_MiniTableField field = {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return false; + } + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &val, sizeof(val)); + return true; +} /* envoy.config.cluster.v3.Cluster.TransportSocketMatch */ @@ -1815,11 +1882,11 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_TransportSocketMatch_has_transpo UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_name(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_TransportSocketMatch_mutable_match(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_cluster_v3_Cluster_TransportSocketMatch_match(msg); @@ -1831,7 +1898,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_Transp } UPB_INLINE void envoy_config_cluster_v3_Cluster_TransportSocketMatch_set_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch *msg, struct envoy_config_core_v3_TransportSocket* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_cluster_v3_Cluster_TransportSocketMatch_mutable_transport_socket(envoy_config_cluster_v3_Cluster_TransportSocketMatch* msg, upb_Arena* arena) { struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_cluster_v3_Cluster_TransportSocketMatch_transport_socket(msg); @@ -1909,11 +1976,11 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_CustomClusterType_has_typed_conf UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_name(envoy_config_cluster_v3_Cluster_CustomClusterType *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_CustomClusterType_set_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Cluster_CustomClusterType_mutable_typed_config(envoy_config_cluster_v3_Cluster_CustomClusterType* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_cluster_v3_Cluster_CustomClusterType_typed_config(msg); @@ -1991,7 +2058,7 @@ UPB_INLINE upb_StringView envoy_config_cluster_v3_Cluster_EdsClusterConfig_servi 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_EdsClusterConfig_mutable_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(msg); @@ -2003,7 +2070,7 @@ 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_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.cluster.v3.Cluster.LbSubsetConfig */ @@ -2165,11 +2232,11 @@ UPB_INLINE int32_t envoy_config_cluster_v3_Cluster_LbSubsetConfig_metadata_fallb UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_cluster_v3_Cluster_LbSubsetConfig_mutable_default_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_cluster_v3_Cluster_LbSubsetConfig_default_subset(msg); @@ -2211,23 +2278,23 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelecto } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_locality_weight_aware(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_scale_locality_weight(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(25, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_panic_mode_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(26, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_list_as_any(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(27, 19), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_set_metadata_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig *msg, int32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector */ @@ -2385,7 +2452,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_set_fallback_policy(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, int32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_mutable_fallback_keys_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2417,7 +2484,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_ } UPB_INLINE void envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_set_single_host_per_subset(envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.cluster.v3.Cluster.SlowStartConfig */ @@ -2507,7 +2574,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_SlowStartConfig_has_min_weight_p UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_slow_start_window(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_SlowStartConfig_slow_start_window(msg); @@ -2519,7 +2586,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_Slow } UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_aggression(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_config_cluster_v3_Cluster_SlowStartConfig_aggression(msg); @@ -2531,7 +2598,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cl } UPB_INLINE void envoy_config_cluster_v3_Cluster_SlowStartConfig_set_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_SlowStartConfig_mutable_min_weight_percent(envoy_config_cluster_v3_Cluster_SlowStartConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_SlowStartConfig_min_weight_percent(msg); @@ -2597,7 +2664,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_has_slow_star UPB_INLINE void envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_set_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig *msg, envoy_config_cluster_v3_Cluster_SlowStartConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_mutable_slow_start_config(envoy_config_cluster_v3_Cluster_RoundRobinLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_SlowStartConfig* sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_slow_start_config(msg); @@ -2695,7 +2762,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_has_slow_st UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_choice_count(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_choice_count(msg); @@ -2707,7 +2774,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_L } UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_active_request_bias(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_active_request_bias(msg); @@ -2719,7 +2786,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_config_cluster_v3_Cl } UPB_INLINE void envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_set_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig *msg, envoy_config_cluster_v3_Cluster_SlowStartConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_SlowStartConfig* envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_mutable_slow_start_config(envoy_config_cluster_v3_Cluster_LeastRequestLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_SlowStartConfig* sub = (struct envoy_config_cluster_v3_Cluster_SlowStartConfig*)envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_slow_start_config(msg); @@ -2813,7 +2880,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_RingHashLbConfig_has_maximum_rin UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_mutable_minimum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_RingHashLbConfig_minimum_ring_size(msg); @@ -2825,11 +2892,11 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_R } UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_hash_function(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_RingHashLbConfig_set_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_RingHashLbConfig_mutable_maximum_ring_size(envoy_config_cluster_v3_Cluster_RingHashLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_RingHashLbConfig_maximum_ring_size(msg); @@ -2895,7 +2962,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_MaglevLbConfig_has_table_size(co UPB_INLINE void envoy_config_cluster_v3_Cluster_MaglevLbConfig_set_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_MaglevLbConfig_mutable_table_size(envoy_config_cluster_v3_Cluster_MaglevLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_MaglevLbConfig_table_size(msg); @@ -3001,15 +3068,15 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_has_metadata UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_use_http_header(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_http_header_name(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_mutable_upstream_port_override(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_upstream_port_override(msg); @@ -3021,7 +3088,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_O } UPB_INLINE void envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_set_metadata_key(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_mutable_metadata_key(envoy_config_cluster_v3_Cluster_OriginalDstLbConfig* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_metadata_key(msg); @@ -3201,7 +3268,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_has_override_host UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_healthy_panic_threshold(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_CommonLbConfig_healthy_panic_threshold(msg); @@ -3213,7 +3280,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonL } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 56), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_zone_aware_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_zone_aware_lb_config(msg); @@ -3225,7 +3292,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConf } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(36, 56), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_locality_weighted_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_locality_weighted_lb_config(msg); @@ -3237,7 +3304,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeighte } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_update_merge_window(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_CommonLbConfig_update_merge_window(msg); @@ -3249,15 +3316,15 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_Comm } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_ignore_new_hosts_until_first_hc(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_close_connections_on_host_set_change(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(25, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 40), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_consistent_hashing_lb_config(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* sub = (struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig*)envoy_config_cluster_v3_Cluster_CommonLbConfig_consistent_hashing_lb_config(msg); @@ -3269,7 +3336,7 @@ UPB_INLINE struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashi } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_set_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig *msg, struct envoy_config_core_v3_HealthStatusSet* value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 48), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthStatusSet* envoy_config_cluster_v3_Cluster_CommonLbConfig_mutable_override_host_status(envoy_config_cluster_v3_Cluster_CommonLbConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthStatusSet* sub = (struct envoy_config_core_v3_HealthStatusSet*)envoy_config_cluster_v3_Cluster_CommonLbConfig_override_host_status(msg); @@ -3363,7 +3430,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_mutable_routing_enabled(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_routing_enabled(msg); @@ -3375,7 +3442,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_cluster_v3_Cluster_CommonL } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_mutable_min_cluster_size(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_min_cluster_size(msg); @@ -3387,7 +3454,7 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_cluster_v3_Cluster_C } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_set_fail_traffic_on_panic(envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig */ @@ -3495,11 +3562,11 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashing UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_use_hostname_for_hashing(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_set_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_mutable_hash_balance_factor(envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_hash_balance_factor(msg); @@ -3581,7 +3648,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_RefreshRate_has_max_interval(con UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_set_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_mutable_base_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_RefreshRate_base_interval(msg); @@ -3593,7 +3660,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_Refr } UPB_INLINE void envoy_config_cluster_v3_Cluster_RefreshRate_set_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_RefreshRate_mutable_max_interval(envoy_config_cluster_v3_Cluster_RefreshRate* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_Cluster_RefreshRate_max_interval(msg); @@ -3675,7 +3742,7 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_PreconnectPolicy_has_predictive_ 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -3687,7 +3754,7 @@ UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_P } 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) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -3874,7 +3941,7 @@ UPB_INLINE bool envoy_config_cluster_v3_LoadBalancingPolicy_Policy_has_typed_ext UPB_INLINE void envoy_config_cluster_v3_LoadBalancingPolicy_Policy_set_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_LoadBalancingPolicy_Policy_mutable_typed_extension_config(envoy_config_cluster_v3_LoadBalancingPolicy_Policy* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_cluster_v3_LoadBalancingPolicy_Policy_typed_extension_config(msg); @@ -3949,10 +4016,26 @@ UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_set_local_inte &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_clear_happy_eyeballs_config(envoy_config_cluster_v3_UpstreamConnectionOptions* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_happy_eyeballs_config(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) { + const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* default_val = NULL; + const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* ret; + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_has_happy_eyeballs_config(const envoy_config_cluster_v3_UpstreamConnectionOptions* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, struct envoy_config_core_v3_TcpKeepalive* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_v3_UpstreamConnectionOptions_mutable_tcp_keepalive(envoy_config_cluster_v3_UpstreamConnectionOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TcpKeepalive* sub = (struct envoy_config_core_v3_TcpKeepalive*)envoy_config_cluster_v3_UpstreamConnectionOptions_tcp_keepalive(msg); @@ -3964,7 +4047,101 @@ UPB_INLINE struct envoy_config_core_v3_TcpKeepalive* envoy_config_cluster_v3_Ups } UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_set_local_interface_name_on_upstream_connections(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_set_happy_eyeballs_config(envoy_config_cluster_v3_UpstreamConnectionOptions *msg, envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* value) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_mutable_happy_eyeballs_config(envoy_config_cluster_v3_UpstreamConnectionOptions* msg, upb_Arena* arena) { + struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig*)envoy_config_cluster_v3_UpstreamConnectionOptions_happy_eyeballs_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig*)_upb_Message_New(&envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, arena); + if (sub) envoy_config_cluster_v3_UpstreamConnectionOptions_set_happy_eyeballs_config(msg, sub); + } + return sub; +} + +/* envoy.config.cluster.v3.UpstreamConnectionOptions.HappyEyeballsConfig */ + +UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_new(upb_Arena* arena) { + return (envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig*)_upb_Message_New(&envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, arena); +} +UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* ret = envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* ret = envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_serialize(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_serialize_ex(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_clear_first_address_family_version(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_first_address_family_version(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_clear_first_address_family_count(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_first_address_family_count(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + const struct google_protobuf_UInt32Value* default_val = NULL; + const struct google_protobuf_UInt32Value* ret; + const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_has_first_address_family_count(const envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg) { + const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_set_first_address_family_version(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig *msg, int32_t value) { + const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_set_first_address_family_count(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig *msg, struct google_protobuf_UInt32Value* value) { + const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_mutable_first_address_family_count(envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig* msg, upb_Arena* arena) { + struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_first_address_family_count(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena); + if (sub) envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_set_first_address_family_count(msg, sub); + } + return sub; } /* envoy.config.cluster.v3.TrackClusterStats */ @@ -4042,15 +4219,15 @@ UPB_INLINE bool envoy_config_cluster_v3_TrackClusterStats_per_endpoint_stats(con UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_timeout_budgets(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_request_response_sizes(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_per_endpoint_stats(envoy_config_cluster_v3_TrackClusterStats *msg, bool value) { const upb_MiniTableField field = {3, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c index 6e9a883eb5..f3ab3dda43 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.c @@ -48,6 +48,9 @@ const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = { &envoy_config_cluster_v3_ClusterCollection_submsgs[0], &envoy_config_cluster_v3_ClusterCollection__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.ClusterCollection", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_submsgs[39] = { @@ -92,9 +95,9 @@ static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_submsgs[39] = { {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = { - {1, UPB_SIZE(192, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[52] = { + {1, UPB_SIZE(196, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(16, 64), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(20, 72), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -111,21 +114,21 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = { {20, UPB_SIZE(64, 144), 73, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {21, UPB_SIZE(68, 152), 74, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {22, UPB_SIZE(72, 160), 75, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {23, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {23, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {24, UPB_SIZE(76, 168), 76, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {25, UPB_SIZE(80, 176), 77, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {26, UPB_SIZE(84, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {27, UPB_SIZE(88, 184), 78, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {28, UPB_SIZE(200, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {28, UPB_SIZE(204, 192), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {29, UPB_SIZE(92, 208), 79, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {30, UPB_SIZE(96, 216), 80, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {31, UPB_SIZE(100, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {32, UPB_SIZE(101, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {33, UPB_SIZE(104, 224), 81, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {34, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {34, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {36, UPB_SIZE(108, 232), 0, 22, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {37, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {38, UPB_SIZE(184, 336), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {37, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {38, UPB_SIZE(188, 344), UPB_SIZE(-113, -29), 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {39, UPB_SIZE(116, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {40, UPB_SIZE(120, 240), 0, 25, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {41, UPB_SIZE(124, 248), 82, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -139,21 +142,25 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[51] = { {49, UPB_SIZE(156, 296), 87, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {50, UPB_SIZE(160, 304), 88, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {51, UPB_SIZE(164, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {52, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {52, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {53, UPB_SIZE(168, 312), 89, 35, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {54, UPB_SIZE(172, 320), 90, 36, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {55, UPB_SIZE(176, 328), 91, 37, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {56, UPB_SIZE(188, 344), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {56, UPB_SIZE(192, 352), UPB_SIZE(-181, -37), 38, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {57, UPB_SIZE(184, 336), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = { &envoy_config_cluster_v3_Cluster_submsgs[0], &envoy_config_cluster_v3_Cluster__fields[0], - UPB_SIZE(208, 352), 51, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(216, 360), 52, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002800003f00000a, &upb_pss_1bt}, - {0x0150001c02000010, &upb_pov4_1bt}, + {0x0158001c02000010, &upb_pov4_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -171,12 +178,12 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = { {0x001000003f000188, &upb_psv4_2bt}, {0x008000003f090192, &upb_prm_2bt_maxmaxb}, {0x002300003f000398, &upb_psb1_2bt}, - {0x01580024342203a2, &upb_pom_2bt_max64b}, - {0x01580024251702aa, &upb_pom_2bt_max64b}, - {0x0150001c261802b2, &upb_pom_2bt_max64b}, - {0x01580024170e01ba, &upb_pom_2bt_max64b}, + {0x01600024342203a2, &upb_pom_2bt_max64b}, + {0x01600024251702aa, &upb_pom_2bt_max64b}, + {0x0158001c261802b2, &upb_pom_2bt_max64b}, + {0x01600024170e01ba, &upb_pom_2bt_max64b}, {0x00f000003f1902c2, &upb_prm_2bt_maxmaxb}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x015000003f0003ca, &upb_prs_2bt}, {0x001400003f0001d0, &upb_psv4_2bt}, {0x010800003f1c02da, &upb_prm_2bt_max64b}, {0x00c000003f0001e2, &upb_pss_2bt}, @@ -201,6 +208,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_ms &envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[0], &envoy_config_cluster_v3_Cluster_TransportSocketMatch__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.TransportSocketMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -220,6 +230,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_i &envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[0], &envoy_config_cluster_v3_Cluster_CustomClusterType__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CustomClusterType", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -239,6 +252,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_in &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.EdsClusterConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -267,6 +283,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig_msg_init &envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_LbSubsetConfig__fields[0], UPB_SIZE(32, 40), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.LbSubsetConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -298,6 +317,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubse NULL, &envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prs_1bt}, @@ -326,6 +348,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_ini &envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_SlowStartConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.SlowStartConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = { @@ -340,6 +365,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_ &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.RoundRobinLbConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = { @@ -358,6 +386,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_ms &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.LeastRequestLbConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = { @@ -375,6 +406,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_in &envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_RingHashLbConfig__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.RingHashLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -395,6 +429,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init &envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_MaglevLbConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.MaglevLbConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[2] = { @@ -413,6 +450,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.OriginalDstLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, @@ -445,6 +485,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init &envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig__fields[0], UPB_SIZE(40, 64), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CommonLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -472,6 +515,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwa &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CommonLbConfig.ZoneAwareLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -484,6 +530,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Localit NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CommonLbConfig.LocalityWeightedLbConfig", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = { @@ -499,6 +548,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Consist &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.CommonLbConfig.ConsistentHashingLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, @@ -519,6 +571,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init = &envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[0], &envoy_config_cluster_v3_Cluster_RefreshRate__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.RefreshRate", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = { @@ -535,6 +590,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_in &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0], &envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.PreconnectPolicy", +#endif }; static const upb_MiniTableSub envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = { @@ -550,6 +608,9 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolO &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[0], &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Cluster.TypedExtensionProtocolOptionsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -568,6 +629,9 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = { &envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[0], &envoy_config_cluster_v3_LoadBalancingPolicy__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.LoadBalancingPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -586,21 +650,29 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_ &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[0], &envoy_config_cluster_v3_LoadBalancingPolicy_Policy__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.LoadBalancingPolicy.Policy", +#endif }; -static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[1] = { +static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TcpKeepalive_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions__fields[2] = { +static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions__fields[3] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init = { &envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[0], &envoy_config_cluster_v3_UpstreamConnectionOptions__fields[0], - 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.UpstreamConnectionOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -609,6 +681,28 @@ const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_in }) }; +static const upb_MiniTableSub envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, +}; + +static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__fields[2] = { + {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init = { + &envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_submsgs[0], + &envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__fields[0], + 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.UpstreamConnectionOptions.HappyEyeballsConfig", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000c00003f000008, &upb_psv4_1bt}, + }) +}; + static const upb_MiniTableField envoy_config_cluster_v3_TrackClusterStats__fields[3] = { {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -619,6 +713,9 @@ const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init = { NULL, &envoy_config_cluster_v3_TrackClusterStats__fields[0], 16, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.TrackClusterStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -627,7 +724,7 @@ const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init = { }) }; -static const upb_MiniTable *messages_layout[24] = { +static const upb_MiniTable *messages_layout[25] = { &envoy__config__cluster__v3__ClusterCollection_msg_init, &envoy__config__cluster__v3__Cluster_msg_init, &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init, @@ -651,6 +748,7 @@ static const upb_MiniTable *messages_layout[24] = { &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init, &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init, &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init, + &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init, &envoy__config__cluster__v3__TrackClusterStats_msg_init, }; @@ -658,7 +756,7 @@ const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout = messages_layout, NULL, NULL, - 24, + 25, 0, 0, }; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h index e6bca85838..2227e30e56 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/cluster.upb_minitable.h @@ -40,6 +40,7 @@ extern const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionPr extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init; extern const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init; extern const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init; +extern const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init; extern const upb_MiniTable envoy__config__cluster__v3__TrackClusterStats_msg_init; extern const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h index 3c922804b8..fef044bb2e 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb.h @@ -114,11 +114,11 @@ UPB_INLINE bool envoy_config_cluster_v3_Filter_has_config_discovery(const envoy_ UPB_INLINE void envoy_config_cluster_v3_Filter_set_name(envoy_config_cluster_v3_Filter *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_Filter_set_typed_config(envoy_config_cluster_v3_Filter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Filter_mutable_typed_config(envoy_config_cluster_v3_Filter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_cluster_v3_Filter_typed_config(msg); @@ -130,7 +130,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_cluster_v3_Filter_mutable_ty } UPB_INLINE void envoy_config_cluster_v3_Filter_set_config_discovery(envoy_config_cluster_v3_Filter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_cluster_v3_Filter_mutable_config_discovery(envoy_config_cluster_v3_Filter* msg, upb_Arena* arena) { struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_config_cluster_v3_Filter_config_discovery(msg); diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c index 8579ce77f6..097a3c17a8 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init = { &envoy_config_cluster_v3_Filter_submsgs[0], &envoy_config_cluster_v3_Filter__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.Filter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h index 128b6e4b30..ac14f9b4c5 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb.h @@ -12,6 +12,7 @@ #include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h" +#include "envoy/config/core/v3/extension.upb_minitable.h" #include "google/protobuf/duration.upb_minitable.h" #include "google/protobuf/wrappers.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" @@ -26,6 +27,7 @@ extern "C" { #endif typedef struct envoy_config_cluster_v3_OutlierDetection { upb_Message UPB_PRIVATE(base); } envoy_config_cluster_v3_OutlierDetection; +struct envoy_config_core_v3_TypedExtensionConfig; struct google_protobuf_BoolValue; struct google_protobuf_Duration; struct google_protobuf_UInt32Value; @@ -432,10 +434,58 @@ UPB_INLINE bool envoy_config_cluster_v3_OutlierDetection_has_successful_active_h const upb_MiniTableField field = {23, UPB_SIZE(100, 184), 85, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_clear_monitors(envoy_config_cluster_v3_OutlierDetection* msg) { + const upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_cluster_v3_OutlierDetection_monitors(const envoy_config_cluster_v3_OutlierDetection* msg, size_t* size) { + const upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (const struct envoy_config_core_v3_TypedExtensionConfig* const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _envoy_config_cluster_v3_OutlierDetection_monitors_upb_array(const envoy_config_cluster_v3_OutlierDetection* msg, size_t* size) { + const upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _envoy_config_cluster_v3_OutlierDetection_monitors_mutable_upb_array(envoy_config_cluster_v3_OutlierDetection* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_clear_always_eject_one_host(envoy_config_cluster_v3_OutlierDetection* msg) { + const upb_MiniTableField field = {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDetection_always_eject_one_host(const envoy_config_cluster_v3_OutlierDetection* msg) { + const struct google_protobuf_BoolValue* default_val = NULL; + const struct google_protobuf_BoolValue* ret; + const upb_MiniTableField field = {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_cluster_v3_OutlierDetection_has_always_eject_one_host(const envoy_config_cluster_v3_OutlierDetection* msg) { + const upb_MiniTableField field = {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_5xx(msg); @@ -447,7 +497,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_interval(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_interval(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_interval(msg); @@ -459,7 +509,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetec } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_base_ejection_time(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_base_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_base_ejection_time(msg); @@ -471,7 +521,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetec } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_percent(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_percent(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_max_ejection_percent(msg); @@ -483,7 +533,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_5xx(msg); @@ -495,7 +545,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_success_rate(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_success_rate(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_success_rate(msg); @@ -507,7 +557,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_minimum_hosts(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_minimum_hosts(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_minimum_hosts(msg); @@ -519,7 +569,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_request_volume(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 72), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_request_volume(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_request_volume(msg); @@ -531,7 +581,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_success_rate_stdev_factor(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {9, UPB_SIZE(44, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_success_rate_stdev_factor(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_success_rate_stdev_factor(msg); @@ -543,7 +593,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_gateway_failure(msg); @@ -555,7 +605,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_gateway_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_gateway_failure(msg); @@ -567,11 +617,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_split_external_local_origin_errors(envoy_config_cluster_v3_OutlierDetection *msg, bool value) { const upb_MiniTableField field = {12, UPB_SIZE(56, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {13, UPB_SIZE(60, 104), 75, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_consecutive_local_origin_failure(msg); @@ -583,7 +633,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {14, UPB_SIZE(64, 112), 76, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_consecutive_local_origin_failure(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_consecutive_local_origin_failure(msg); @@ -595,7 +645,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_local_origin_success_rate(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {15, UPB_SIZE(68, 120), 77, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_local_origin_success_rate(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_local_origin_success_rate(msg); @@ -607,7 +657,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_threshold(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {16, UPB_SIZE(72, 128), 78, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_threshold(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_threshold(msg); @@ -619,7 +669,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_percentage(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {17, UPB_SIZE(76, 136), 79, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_failure_percentage(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_failure_percentage(msg); @@ -631,7 +681,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_enforcing_failure_percentage_local_origin(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {18, UPB_SIZE(80, 144), 80, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_enforcing_failure_percentage_local_origin(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_enforcing_failure_percentage_local_origin(msg); @@ -643,7 +693,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_minimum_hosts(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {19, UPB_SIZE(84, 152), 81, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_minimum_hosts(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_minimum_hosts(msg); @@ -655,7 +705,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_failure_percentage_request_volume(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {20, UPB_SIZE(88, 160), 82, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_mutable_failure_percentage_request_volume(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_cluster_v3_OutlierDetection_failure_percentage_request_volume(msg); @@ -667,7 +717,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {21, UPB_SIZE(92, 168), 83, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -679,7 +729,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetec } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time_jitter(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {22, UPB_SIZE(96, 176), 84, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_time_jitter(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_jitter(msg); @@ -691,7 +741,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetec } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_successful_active_health_check_uneject_host(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {23, UPB_SIZE(100, 184), 85, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDetection_mutable_successful_active_health_check_uneject_host(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_cluster_v3_OutlierDetection_successful_active_health_check_uneject_host(msg); @@ -701,6 +751,48 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDete } return sub; } +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_cluster_v3_OutlierDetection_mutable_monitors(envoy_config_cluster_v3_OutlierDetection* msg, size_t* size) { + upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (struct envoy_config_core_v3_TypedExtensionConfig**)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_cluster_v3_OutlierDetection_resize_monitors(envoy_config_cluster_v3_OutlierDetection* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (struct envoy_config_core_v3_TypedExtensionConfig**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_OutlierDetection_add_monitors(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { + upb_MiniTableField field = {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return NULL; + } + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena); + if (!arr || !sub) return NULL; + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); + return sub; +} +UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_always_eject_one_host(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_BoolValue* value) { + const upb_MiniTableField field = {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDetection_mutable_always_eject_one_host(envoy_config_cluster_v3_OutlierDetection* msg, upb_Arena* arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_cluster_v3_OutlierDetection_always_eject_one_host(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena); + if (sub) envoy_config_cluster_v3_OutlierDetection_set_always_eject_one_host(msg, sub); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c index 9cc2c69ffb..8c8d43f17d 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.c @@ -8,6 +8,7 @@ #include #include "upb/generated_code_support.h" #include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h" +#include "envoy/config/core/v3/extension.upb_minitable.h" #include "google/protobuf/duration.upb_minitable.h" #include "google/protobuf/wrappers.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" @@ -17,7 +18,7 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[22] = { +static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[24] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, @@ -40,9 +41,11 @@ static const upb_MiniTableSub envoy_config_cluster_v3_OutlierDetection_submsgs[2 {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, }; -static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields[23] = { +static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields[25] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -66,12 +69,17 @@ static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields {21, UPB_SIZE(92, 168), 83, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {22, UPB_SIZE(96, 176), 84, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {23, UPB_SIZE(100, 184), 85, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {24, UPB_SIZE(104, 192), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {25, UPB_SIZE(108, 200), 86, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = { &envoy_config_cluster_v3_OutlierDetection_submsgs[0], &envoy_config_cluster_v3_OutlierDetection__fields[0], - UPB_SIZE(104, 192), 23, kUpb_ExtMode_NonExtendable, 23, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(112, 208), 25, kUpb_ExtMode_NonExtendable, 25, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.cluster.v3.OutlierDetection", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -89,6 +97,22 @@ const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x00c000003f1601c2, &upb_prm_2bt_maxmaxb}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h index 18716ac763..5a8d513a15 100644 --- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h +++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb.h @@ -143,7 +143,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_has_on_no_match(const env UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_list(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherList* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_config_common_matcher_v3_Matcher_mutable_matcher_list(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList*)envoy_config_common_matcher_v3_Matcher_matcher_list(msg); @@ -155,7 +155,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList* envoy_conf } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_matcher_tree(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_config_common_matcher_v3_Matcher_mutable_matcher_tree(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherTree* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree*)envoy_config_common_matcher_v3_Matcher_matcher_tree(msg); @@ -167,7 +167,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree* envoy_conf } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_set_on_no_match(envoy_config_common_matcher_v3_Matcher *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {3, 16, 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_mutable_on_no_match(envoy_config_common_matcher_v3_Matcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_on_no_match(msg); @@ -259,7 +259,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_OnMatch_has_action(const UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch *msg, envoy_config_common_matcher_v3_Matcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_matcher(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher* sub = (struct envoy_config_common_matcher_v3_Matcher*)envoy_config_common_matcher_v3_Matcher_OnMatch_matcher(msg); @@ -271,7 +271,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher* envoy_config_common_ma } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_OnMatch_set_action(envoy_config_common_matcher_v3_Matcher_OnMatch *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_OnMatch_mutable_action(envoy_config_common_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_OnMatch_action(msg); @@ -497,7 +497,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_has UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg); @@ -509,7 +509,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_S } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg); @@ -521,7 +521,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_P } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg); @@ -533,7 +533,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_P } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg); @@ -641,7 +641,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_Sin UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg); @@ -653,7 +653,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg); @@ -665,7 +665,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_common_match } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg); @@ -847,7 +847,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_ UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg); @@ -859,7 +859,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate* } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, envoy_config_common_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_OnMatch* envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_OnMatch* sub = (struct envoy_config_common_matcher_v3_Matcher_OnMatch*)envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg); @@ -984,7 +984,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_Matcher_MatcherTree_has_custom_ma UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_input(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_input(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_input(msg); @@ -996,7 +996,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_exact_match_map(msg); @@ -1008,7 +1008,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* e } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap*)envoy_config_common_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg); @@ -1020,7 +1020,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap* e } UPB_INLINE void envoy_config_common_matcher_v3_Matcher_MatcherTree_set_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_common_matcher_v3_Matcher_MatcherTree_mutable_custom_match(envoy_config_common_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_common_matcher_v3_Matcher_MatcherTree_custom_match(msg); @@ -1361,7 +1361,7 @@ UPB_INLINE bool envoy_config_common_matcher_v3_MatchPredicate_has_http_response_ UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_or_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate_MatchSet* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_or_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_or_match(msg); @@ -1373,7 +1373,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_and_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate_MatchSet* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_config_common_matcher_v3_MatchPredicate_mutable_and_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet*)envoy_config_common_matcher_v3_MatchPredicate_and_match(msg); @@ -1385,7 +1385,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate_MatchSet* envoy_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_not_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_MatchPredicate* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_common_matcher_v3_MatchPredicate_mutable_not_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_common_matcher_v3_MatchPredicate_not_match(msg); @@ -1397,11 +1397,11 @@ UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_co } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_any_match(envoy_config_common_matcher_v3_MatchPredicate *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_headers_match(msg); @@ -1413,7 +1413,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_trailers_match(msg); @@ -1425,7 +1425,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_headers_match(msg); @@ -1437,7 +1437,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpHeadersMatch* sub = (struct envoy_config_common_matcher_v3_HttpHeadersMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_trailers_match(msg); @@ -1449,7 +1449,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpHeadersMatch* envoy_config_ } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpGenericBodyMatch* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_request_generic_body_match(msg); @@ -1461,7 +1461,7 @@ UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_con } UPB_INLINE void envoy_config_common_matcher_v3_MatchPredicate_set_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate *msg, envoy_config_common_matcher_v3_HttpGenericBodyMatch* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* envoy_config_common_matcher_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_common_matcher_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_HttpGenericBodyMatch* sub = (struct envoy_config_common_matcher_v3_HttpGenericBodyMatch*)envoy_config_common_matcher_v3_MatchPredicate_http_response_generic_body_match(msg); @@ -1755,7 +1755,7 @@ UPB_INLINE upb_Array* _envoy_config_common_matcher_v3_HttpGenericBodyMatch_patte UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_config_common_matcher_v3_HttpGenericBodyMatch *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_common_matcher_v3_HttpGenericBodyMatch_mutable_patterns(envoy_config_common_matcher_v3_HttpGenericBodyMatch* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1869,11 +1869,11 @@ UPB_INLINE bool envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextM UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_set_string_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch_set_binary_match(envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c index 6438446764..e7c5e693ea 100644 --- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init = { &envoy_config_common_matcher_v3_Matcher_submsgs[0], &envoy_config_common_matcher_v3_Matcher__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pom_1bt_max64b}, @@ -55,6 +58,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_ini &envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[0], &envoy_config_common_matcher_v3_Matcher_OnMatch__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.OnMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -75,6 +81,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg &envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -99,6 +108,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__fields[0], UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -127,6 +139,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -147,6 +162,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList.Predicate.PredicateList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -167,6 +185,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Fi &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherList.FieldMatcher", +#endif }; static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = { @@ -187,6 +208,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg &envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherTree__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherTree", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -211,6 +235,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap", +#endif }; static const upb_MiniTableSub envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { @@ -226,6 +253,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0], &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -261,6 +291,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init &envoy_config_common_matcher_v3_MatchPredicate_submsgs[0], &envoy_config_common_matcher_v3_MatchPredicate__fields[0], UPB_SIZE(16, 24), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.MatchPredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -293,6 +326,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[0], &envoy_config_common_matcher_v3_MatchPredicate_MatchSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.MatchPredicate.MatchSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -311,6 +347,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_ini &envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[0], &envoy_config_common_matcher_v3_HttpHeadersMatch__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.HttpHeadersMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -330,6 +369,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg &envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[0], &envoy_config_common_matcher_v3_HttpGenericBodyMatch__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.HttpGenericBodyMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -347,6 +389,9 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch__Ge NULL, &envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.common.matcher.v3.HttpGenericBodyMatch.GenericTextMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h index f8d0c4a51d..0c40c12617 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb.h @@ -111,11 +111,11 @@ UPB_INLINE uint32_t envoy_config_core_v3_Pipe_mode(const envoy_config_core_v3_Pi UPB_INLINE void envoy_config_core_v3_Pipe_set_path(envoy_config_core_v3_Pipe *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Pipe_set_mode(envoy_config_core_v3_Pipe *msg, uint32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.EnvoyInternalAddress */ @@ -194,11 +194,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_EnvoyInternalAddress_endpoint_id( UPB_INLINE void envoy_config_core_v3_EnvoyInternalAddress_set_server_listener_name(envoy_config_core_v3_EnvoyInternalAddress *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_EnvoyInternalAddress_set_endpoint_id(envoy_config_core_v3_EnvoyInternalAddress *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.SocketAddress */ @@ -330,27 +330,27 @@ UPB_INLINE bool envoy_config_core_v3_SocketAddress_ipv4_compat(const envoy_confi UPB_INLINE void envoy_config_core_v3_SocketAddress_set_protocol(envoy_config_core_v3_SocketAddress *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_address(envoy_config_core_v3_SocketAddress *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_port_value(envoy_config_core_v3_SocketAddress *msg, uint32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), -13, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_named_port(envoy_config_core_v3_SocketAddress *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_resolver_name(envoy_config_core_v3_SocketAddress *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketAddress_set_ipv4_compat(envoy_config_core_v3_SocketAddress *msg, bool value) { const upb_MiniTableField field = {6, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.TcpKeepalive */ @@ -440,7 +440,7 @@ UPB_INLINE bool envoy_config_core_v3_TcpKeepalive_has_keepalive_interval(const e UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_probes(envoy_config_core_v3_TcpKeepalive *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_probes(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_probes(msg); @@ -452,7 +452,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive } UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_time(envoy_config_core_v3_TcpKeepalive *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_time(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_time(msg); @@ -464,7 +464,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive } UPB_INLINE void envoy_config_core_v3_TcpKeepalive_set_keepalive_interval(envoy_config_core_v3_TcpKeepalive *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_TcpKeepalive_mutable_keepalive_interval(envoy_config_core_v3_TcpKeepalive* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_TcpKeepalive_keepalive_interval(msg); @@ -546,7 +546,7 @@ UPB_INLINE bool envoy_config_core_v3_ExtraSourceAddress_has_socket_options(const UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_set_address(envoy_config_core_v3_ExtraSourceAddress *msg, envoy_config_core_v3_SocketAddress* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_ExtraSourceAddress_mutable_address(envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_ExtraSourceAddress_address(msg); @@ -558,7 +558,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Extra } UPB_INLINE void envoy_config_core_v3_ExtraSourceAddress_set_socket_options(envoy_config_core_v3_ExtraSourceAddress *msg, struct envoy_config_core_v3_SocketOptionsOverride* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_core_v3_ExtraSourceAddress_mutable_socket_options(envoy_config_core_v3_ExtraSourceAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketOptionsOverride* sub = (struct envoy_config_core_v3_SocketOptionsOverride*)envoy_config_core_v3_ExtraSourceAddress_socket_options(msg); @@ -752,7 +752,7 @@ UPB_INLINE bool envoy_config_core_v3_BindConfig_has_local_address_selector(const UPB_INLINE void envoy_config_core_v3_BindConfig_set_source_address(envoy_config_core_v3_BindConfig *msg, envoy_config_core_v3_SocketAddress* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindConfig_mutable_source_address(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_BindConfig_source_address(msg); @@ -764,7 +764,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_BindC } UPB_INLINE void envoy_config_core_v3_BindConfig_set_freebind(envoy_config_core_v3_BindConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_BindConfig_mutable_freebind(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_BindConfig_freebind(msg); @@ -866,7 +866,7 @@ UPB_INLINE struct envoy_config_core_v3_ExtraSourceAddress* envoy_config_core_v3_ } UPB_INLINE void envoy_config_core_v3_BindConfig_set_local_address_selector(envoy_config_core_v3_BindConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 66, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_BindConfig_mutable_local_address_selector(envoy_config_core_v3_BindConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_core_v3_BindConfig_local_address_selector(msg); @@ -975,7 +975,7 @@ UPB_INLINE bool envoy_config_core_v3_Address_has_envoy_internal_address(const en UPB_INLINE void envoy_config_core_v3_Address_set_socket_address(envoy_config_core_v3_Address *msg, envoy_config_core_v3_SocketAddress* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Address_mutable_socket_address(envoy_config_core_v3_Address* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_core_v3_Address_socket_address(msg); @@ -987,7 +987,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_core_v3_Addre } UPB_INLINE void envoy_config_core_v3_Address_set_pipe(envoy_config_core_v3_Address *msg, envoy_config_core_v3_Pipe* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Pipe* envoy_config_core_v3_Address_mutable_pipe(envoy_config_core_v3_Address* msg, upb_Arena* arena) { struct envoy_config_core_v3_Pipe* sub = (struct envoy_config_core_v3_Pipe*)envoy_config_core_v3_Address_pipe(msg); @@ -999,7 +999,7 @@ UPB_INLINE struct envoy_config_core_v3_Pipe* envoy_config_core_v3_Address_mutabl } UPB_INLINE void envoy_config_core_v3_Address_set_envoy_internal_address(envoy_config_core_v3_Address *msg, envoy_config_core_v3_EnvoyInternalAddress* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_EnvoyInternalAddress* envoy_config_core_v3_Address_mutable_envoy_internal_address(envoy_config_core_v3_Address* msg, upb_Arena* arena) { struct envoy_config_core_v3_EnvoyInternalAddress* sub = (struct envoy_config_core_v3_EnvoyInternalAddress*)envoy_config_core_v3_Address_envoy_internal_address(msg); @@ -1077,11 +1077,11 @@ UPB_INLINE bool envoy_config_core_v3_CidrRange_has_prefix_len(const envoy_config UPB_INLINE void envoy_config_core_v3_CidrRange_set_address_prefix(envoy_config_core_v3_CidrRange *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_CidrRange_set_prefix_len(envoy_config_core_v3_CidrRange *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_CidrRange_mutable_prefix_len(envoy_config_core_v3_CidrRange* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_CidrRange_prefix_len(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c index af6548e146..339a591cde 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__core__v3__Pipe_msg_init = { NULL, &envoy_config_core_v3_Pipe__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Pipe", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -45,6 +48,9 @@ const upb_MiniTable envoy__config__core__v3__EnvoyInternalAddress_msg_init = { NULL, &envoy_config_core_v3_EnvoyInternalAddress__fields[0], UPB_SIZE(32, 48), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.EnvoyInternalAddress", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -66,6 +72,9 @@ const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init = { NULL, &envoy_config_core_v3_SocketAddress__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SocketAddress", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -94,6 +103,9 @@ const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = { &envoy_config_core_v3_TcpKeepalive_submsgs[0], &envoy_config_core_v3_TcpKeepalive__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.TcpKeepalive", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = { @@ -110,6 +122,9 @@ const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = { &envoy_config_core_v3_ExtraSourceAddress_submsgs[0], &envoy_config_core_v3_ExtraSourceAddress__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ExtraSourceAddress", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_BindConfig_submsgs[6] = { @@ -134,6 +149,9 @@ const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = { &envoy_config_core_v3_BindConfig_submsgs[0], &envoy_config_core_v3_BindConfig__fields[0], UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.BindConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -162,6 +180,9 @@ const upb_MiniTable envoy__config__core__v3__Address_msg_init = { &envoy_config_core_v3_Address_submsgs[0], &envoy_config_core_v3_Address__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Address", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max128b}, @@ -183,6 +204,9 @@ const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init = { &envoy_config_core_v3_CidrRange_submsgs[0], &envoy_config_core_v3_CidrRange__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.CidrRange", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h index a90189121d..0fc5ece510 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb.h @@ -100,7 +100,7 @@ UPB_INLINE bool envoy_config_core_v3_BackoffStrategy_has_max_interval(const envo UPB_INLINE void envoy_config_core_v3_BackoffStrategy_set_base_interval(envoy_config_core_v3_BackoffStrategy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy_mutable_base_interval(envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_BackoffStrategy_base_interval(msg); @@ -112,7 +112,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy } UPB_INLINE void envoy_config_core_v3_BackoffStrategy_set_max_interval(envoy_config_core_v3_BackoffStrategy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy_mutable_max_interval(envoy_config_core_v3_BackoffStrategy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_BackoffStrategy_max_interval(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c index d8251ee5cc..4805979ead 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init = { &envoy_config_core_v3_BackoffStrategy_submsgs[0], &envoy_config_core_v3_BackoffStrategy__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.BackoffStrategy", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h index 8d245d4860..0ea85ae0c4 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb.h @@ -46,6 +46,9 @@ typedef struct envoy_config_core_v3_RuntimeUInt32 { upb_Message UPB_PRIVATE(base typedef struct envoy_config_core_v3_RuntimePercent { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RuntimePercent; typedef struct envoy_config_core_v3_RuntimeDouble { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RuntimeDouble; typedef struct envoy_config_core_v3_RuntimeFeatureFlag { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RuntimeFeatureFlag; +typedef struct envoy_config_core_v3_KeyValue { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_KeyValue; +typedef struct envoy_config_core_v3_KeyValueAppend { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_KeyValueAppend; +typedef struct envoy_config_core_v3_KeyValueMutation { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_KeyValueMutation; typedef struct envoy_config_core_v3_QueryParameter { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_QueryParameter; typedef struct envoy_config_core_v3_HeaderValue { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_HeaderValue; typedef struct envoy_config_core_v3_HeaderValueOption { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_HeaderValueOption; @@ -53,6 +56,8 @@ typedef struct envoy_config_core_v3_HeaderMap { upb_Message UPB_PRIVATE(base); } typedef struct envoy_config_core_v3_WatchedDirectory { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_WatchedDirectory; typedef struct envoy_config_core_v3_DataSource { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_DataSource; typedef struct envoy_config_core_v3_RetryPolicy { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RetryPolicy; +typedef struct envoy_config_core_v3_RetryPolicy_RetryPriority { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RetryPolicy_RetryPriority; +typedef struct envoy_config_core_v3_RetryPolicy_RetryHostPredicate { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RetryPolicy_RetryHostPredicate; typedef struct envoy_config_core_v3_RemoteDataSource { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_RemoteDataSource; typedef struct envoy_config_core_v3_AsyncDataSource { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_AsyncDataSource; typedef struct envoy_config_core_v3_TransportSocket { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_TransportSocket; @@ -77,6 +82,13 @@ typedef enum { envoy_config_core_v3_HeaderValueOption_OVERWRITE_IF_EXISTS = 3 } envoy_config_core_v3_HeaderValueOption_HeaderAppendAction; +typedef enum { + envoy_config_core_v3_KeyValueAppend_APPEND_IF_EXISTS_OR_ADD = 0, + envoy_config_core_v3_KeyValueAppend_ADD_IF_ABSENT = 1, + envoy_config_core_v3_KeyValueAppend_OVERWRITE_IF_EXISTS_OR_ADD = 2, + envoy_config_core_v3_KeyValueAppend_OVERWRITE_IF_EXISTS = 3 +} envoy_config_core_v3_KeyValueAppend_KeyValueAppendAction; + typedef enum { envoy_config_core_v3_METHOD_UNSPECIFIED = 0, envoy_config_core_v3_GET = 1, @@ -178,15 +190,15 @@ UPB_INLINE upb_StringView envoy_config_core_v3_Locality_sub_zone(const envoy_con UPB_INLINE void envoy_config_core_v3_Locality_set_region(envoy_config_core_v3_Locality *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Locality_set_zone(envoy_config_core_v3_Locality *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Locality_set_sub_zone(envoy_config_core_v3_Locality *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.BuildVersion */ @@ -260,7 +272,7 @@ UPB_INLINE bool envoy_config_core_v3_BuildVersion_has_metadata(const envoy_confi UPB_INLINE void envoy_config_core_v3_BuildVersion_set_version(envoy_config_core_v3_BuildVersion *msg, struct envoy_type_v3_SemanticVersion* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_SemanticVersion* envoy_config_core_v3_BuildVersion_mutable_version(envoy_config_core_v3_BuildVersion* msg, upb_Arena* arena) { struct envoy_type_v3_SemanticVersion* sub = (struct envoy_type_v3_SemanticVersion*)envoy_config_core_v3_BuildVersion_version(msg); @@ -272,7 +284,7 @@ UPB_INLINE struct envoy_type_v3_SemanticVersion* envoy_config_core_v3_BuildVersi } UPB_INLINE void envoy_config_core_v3_BuildVersion_set_metadata(envoy_config_core_v3_BuildVersion *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_BuildVersion_mutable_metadata(envoy_config_core_v3_BuildVersion* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_BuildVersion_metadata(msg); @@ -418,19 +430,19 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_Extension_type_urls_mutable_upb_arra UPB_INLINE void envoy_config_core_v3_Extension_set_name(envoy_config_core_v3_Extension *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Extension_set_category(envoy_config_core_v3_Extension *msg, upb_StringView value) { const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Extension_set_type_descriptor(envoy_config_core_v3_Extension *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Extension_set_version(envoy_config_core_v3_Extension *msg, envoy_config_core_v3_BuildVersion* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Extension_mutable_version(envoy_config_core_v3_Extension* msg, upb_Arena* arena) { struct envoy_config_core_v3_BuildVersion* sub = (struct envoy_config_core_v3_BuildVersion*)envoy_config_core_v3_Extension_version(msg); @@ -442,7 +454,7 @@ UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Extens } UPB_INLINE void envoy_config_core_v3_Extension_set_disabled(envoy_config_core_v3_Extension *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_core_v3_Extension_mutable_type_urls(envoy_config_core_v3_Extension* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(20, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -747,15 +759,15 @@ UPB_INLINE upb_Map* _envoy_config_core_v3_Node_dynamic_parameters_mutable_upb_ma UPB_INLINE void envoy_config_core_v3_Node_set_id(envoy_config_core_v3_Node *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Node_set_cluster(envoy_config_core_v3_Node *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Node_set_metadata(envoy_config_core_v3_Node *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_Node_mutable_metadata(envoy_config_core_v3_Node* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_Node_metadata(msg); @@ -767,7 +779,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_Node_mutable_meta } UPB_INLINE void envoy_config_core_v3_Node_set_locality(envoy_config_core_v3_Node *msg, envoy_config_core_v3_Locality* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 72), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_core_v3_Node_mutable_locality(envoy_config_core_v3_Node* msg, upb_Arena* arena) { struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_core_v3_Node_locality(msg); @@ -779,15 +791,15 @@ UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_core_v3_Node_mutab } UPB_INLINE void envoy_config_core_v3_Node_set_user_agent_name(envoy_config_core_v3_Node *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(64, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Node_set_user_agent_version(envoy_config_core_v3_Node *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(40, 16), UPB_SIZE(-21, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Node_set_user_agent_build_version(envoy_config_core_v3_Node *msg, envoy_config_core_v3_BuildVersion* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 16), UPB_SIZE(-21, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BuildVersion* envoy_config_core_v3_Node_mutable_user_agent_build_version(envoy_config_core_v3_Node* msg, upb_Arena* arena) { struct envoy_config_core_v3_BuildVersion* sub = (struct envoy_config_core_v3_BuildVersion*)envoy_config_core_v3_Node_user_agent_build_version(msg); @@ -1183,11 +1195,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimeUInt32_runtime_key(const e UPB_INLINE void envoy_config_core_v3_RuntimeUInt32_set_default_value(envoy_config_core_v3_RuntimeUInt32 *msg, uint32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_RuntimeUInt32_set_runtime_key(envoy_config_core_v3_RuntimeUInt32 *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.RuntimePercent */ @@ -1257,7 +1269,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimePercent_runtime_key(const UPB_INLINE void envoy_config_core_v3_RuntimePercent_set_default_value(envoy_config_core_v3_RuntimePercent *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1269,7 +1281,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_RuntimePercent_mut } UPB_INLINE void envoy_config_core_v3_RuntimePercent_set_runtime_key(envoy_config_core_v3_RuntimePercent *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.RuntimeDouble */ @@ -1335,11 +1347,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimeDouble_runtime_key(const e UPB_INLINE void envoy_config_core_v3_RuntimeDouble_set_default_value(envoy_config_core_v3_RuntimeDouble *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_RuntimeDouble_set_runtime_key(envoy_config_core_v3_RuntimeDouble *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.RuntimeFeatureFlag */ @@ -1409,7 +1421,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimeFeatureFlag_runtime_key(co UPB_INLINE void envoy_config_core_v3_RuntimeFeatureFlag_set_default_value(envoy_config_core_v3_RuntimeFeatureFlag *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_RuntimeFeatureFlag_mutable_default_value(envoy_config_core_v3_RuntimeFeatureFlag* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_RuntimeFeatureFlag_default_value(msg); @@ -1421,7 +1433,241 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_RuntimeFeature } UPB_INLINE void envoy_config_core_v3_RuntimeFeatureFlag_set_runtime_key(envoy_config_core_v3_RuntimeFeatureFlag *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.core.v3.KeyValue */ + +UPB_INLINE envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValue_new(upb_Arena* arena) { + return (envoy_config_core_v3_KeyValue*)_upb_Message_New(&envoy__config__core__v3__KeyValue_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValue_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_KeyValue* ret = envoy_config_core_v3_KeyValue_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValue_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValue_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_KeyValue* ret = envoy_config_core_v3_KeyValue_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValue_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_KeyValue_serialize(const envoy_config_core_v3_KeyValue* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValue_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_KeyValue_serialize_ex(const envoy_config_core_v3_KeyValue* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValue_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_core_v3_KeyValue_clear_key(envoy_config_core_v3_KeyValue* msg) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_KeyValue_key(const envoy_config_core_v3_KeyValue* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_core_v3_KeyValue_clear_value(envoy_config_core_v3_KeyValue* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_KeyValue_value(const envoy_config_core_v3_KeyValue* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_config_core_v3_KeyValue_set_key(envoy_config_core_v3_KeyValue *msg, upb_StringView value) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_KeyValue_set_value(envoy_config_core_v3_KeyValue *msg, upb_StringView value) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.core.v3.KeyValueAppend */ + +UPB_INLINE envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueAppend_new(upb_Arena* arena) { + return (envoy_config_core_v3_KeyValueAppend*)_upb_Message_New(&envoy__config__core__v3__KeyValueAppend_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueAppend_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_KeyValueAppend* ret = envoy_config_core_v3_KeyValueAppend_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValueAppend_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueAppend_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_KeyValueAppend* ret = envoy_config_core_v3_KeyValueAppend_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValueAppend_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_KeyValueAppend_serialize(const envoy_config_core_v3_KeyValueAppend* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValueAppend_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_KeyValueAppend_serialize_ex(const envoy_config_core_v3_KeyValueAppend* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValueAppend_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_core_v3_KeyValueAppend_clear_entry(envoy_config_core_v3_KeyValueAppend* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValueAppend_entry(const envoy_config_core_v3_KeyValueAppend* msg) { + const envoy_config_core_v3_KeyValue* default_val = NULL; + const envoy_config_core_v3_KeyValue* ret; + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_KeyValueAppend_has_entry(const envoy_config_core_v3_KeyValueAppend* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_KeyValueAppend_clear_action(envoy_config_core_v3_KeyValueAppend* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t envoy_config_core_v3_KeyValueAppend_action(const envoy_config_core_v3_KeyValueAppend* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_config_core_v3_KeyValueAppend_set_entry(envoy_config_core_v3_KeyValueAppend *msg, envoy_config_core_v3_KeyValue* value) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_KeyValue* envoy_config_core_v3_KeyValueAppend_mutable_entry(envoy_config_core_v3_KeyValueAppend* msg, upb_Arena* arena) { + struct envoy_config_core_v3_KeyValue* sub = (struct envoy_config_core_v3_KeyValue*)envoy_config_core_v3_KeyValueAppend_entry(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_KeyValue*)_upb_Message_New(&envoy__config__core__v3__KeyValue_msg_init, arena); + if (sub) envoy_config_core_v3_KeyValueAppend_set_entry(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_core_v3_KeyValueAppend_set_action(envoy_config_core_v3_KeyValueAppend *msg, int32_t value) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.core.v3.KeyValueMutation */ + +UPB_INLINE envoy_config_core_v3_KeyValueMutation* envoy_config_core_v3_KeyValueMutation_new(upb_Arena* arena) { + return (envoy_config_core_v3_KeyValueMutation*)_upb_Message_New(&envoy__config__core__v3__KeyValueMutation_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_KeyValueMutation* envoy_config_core_v3_KeyValueMutation_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_KeyValueMutation* ret = envoy_config_core_v3_KeyValueMutation_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValueMutation_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_KeyValueMutation* envoy_config_core_v3_KeyValueMutation_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_KeyValueMutation* ret = envoy_config_core_v3_KeyValueMutation_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__KeyValueMutation_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_KeyValueMutation_serialize(const envoy_config_core_v3_KeyValueMutation* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValueMutation_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_KeyValueMutation_serialize_ex(const envoy_config_core_v3_KeyValueMutation* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__KeyValueMutation_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_core_v3_KeyValueMutation_clear_append(envoy_config_core_v3_KeyValueMutation* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueMutation_append(const envoy_config_core_v3_KeyValueMutation* msg) { + const envoy_config_core_v3_KeyValueAppend* default_val = NULL; + const envoy_config_core_v3_KeyValueAppend* ret; + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_KeyValueMutation_has_append(const envoy_config_core_v3_KeyValueMutation* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_KeyValueMutation_clear_remove(envoy_config_core_v3_KeyValueMutation* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_KeyValueMutation_remove(const envoy_config_core_v3_KeyValueMutation* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_config_core_v3_KeyValueMutation_set_append(envoy_config_core_v3_KeyValueMutation *msg, envoy_config_core_v3_KeyValueAppend* value) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_KeyValueAppend* envoy_config_core_v3_KeyValueMutation_mutable_append(envoy_config_core_v3_KeyValueMutation* msg, upb_Arena* arena) { + struct envoy_config_core_v3_KeyValueAppend* sub = (struct envoy_config_core_v3_KeyValueAppend*)envoy_config_core_v3_KeyValueMutation_append(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_KeyValueAppend*)_upb_Message_New(&envoy__config__core__v3__KeyValueAppend_msg_init, arena); + if (sub) envoy_config_core_v3_KeyValueMutation_set_append(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_core_v3_KeyValueMutation_set_remove(envoy_config_core_v3_KeyValueMutation *msg, upb_StringView value) { + const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.QueryParameter */ @@ -1487,11 +1733,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_QueryParameter_value(const envoy_ UPB_INLINE void envoy_config_core_v3_QueryParameter_set_key(envoy_config_core_v3_QueryParameter *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_QueryParameter_set_value(envoy_config_core_v3_QueryParameter *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HeaderValue */ @@ -1569,15 +1815,15 @@ UPB_INLINE upb_StringView envoy_config_core_v3_HeaderValue_raw_value(const envoy UPB_INLINE void envoy_config_core_v3_HeaderValue_set_key(envoy_config_core_v3_HeaderValue *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HeaderValue_set_value(envoy_config_core_v3_HeaderValue *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HeaderValue_set_raw_value(envoy_config_core_v3_HeaderValue *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HeaderValueOption */ @@ -1675,7 +1921,7 @@ UPB_INLINE bool envoy_config_core_v3_HeaderValueOption_keep_empty_value(const en UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_header(envoy_config_core_v3_HeaderValueOption *msg, envoy_config_core_v3_HeaderValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderValueOption_mutable_header(envoy_config_core_v3_HeaderValueOption* msg, upb_Arena* arena) { struct envoy_config_core_v3_HeaderValue* sub = (struct envoy_config_core_v3_HeaderValue*)envoy_config_core_v3_HeaderValueOption_header(msg); @@ -1687,7 +1933,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderV } UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_append(envoy_config_core_v3_HeaderValueOption *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HeaderValueOption_mutable_append(envoy_config_core_v3_HeaderValueOption* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_HeaderValueOption_append(msg); @@ -1699,11 +1945,11 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HeaderValueOpt } UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_append_action(envoy_config_core_v3_HeaderValueOption *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HeaderValueOption_set_keep_empty_value(envoy_config_core_v3_HeaderValueOption *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HeaderMap */ @@ -1857,7 +2103,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_WatchedDirectory_path(const envoy UPB_INLINE void envoy_config_core_v3_WatchedDirectory_set_path(envoy_config_core_v3_WatchedDirectory *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.DataSource */ @@ -1904,90 +2150,118 @@ typedef enum { envoy_config_core_v3_DataSource_specifier_NOT_SET = 0 } envoy_config_core_v3_DataSource_specifier_oneofcases; UPB_INLINE envoy_config_core_v3_DataSource_specifier_oneofcases envoy_config_core_v3_DataSource_specifier_case(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return (envoy_config_core_v3_DataSource_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_clear_filename(envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_DataSource_filename(const envoy_config_core_v3_DataSource* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_DataSource_has_filename(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_clear_inline_bytes(envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_DataSource_inline_bytes(const envoy_config_core_v3_DataSource* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_DataSource_has_inline_bytes(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_clear_inline_string(envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_DataSource_inline_string(const envoy_config_core_v3_DataSource* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_DataSource_has_inline_string(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_clear_environment_variable(envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_DataSource_environment_variable(const envoy_config_core_v3_DataSource* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_DataSource_has_environment_variable(const envoy_config_core_v3_DataSource* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_DataSource_clear_watched_directory(envoy_config_core_v3_DataSource* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_DataSource_watched_directory(const envoy_config_core_v3_DataSource* msg) { + const envoy_config_core_v3_WatchedDirectory* default_val = NULL; + const envoy_config_core_v3_WatchedDirectory* ret; + const upb_MiniTableField field = {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_DataSource_has_watched_directory(const envoy_config_core_v3_DataSource* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_DataSource_set_filename(envoy_config_core_v3_DataSource *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_DataSource_set_inline_bytes(envoy_config_core_v3_DataSource *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_DataSource_set_inline_string(envoy_config_core_v3_DataSource *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_DataSource_set_environment_variable(envoy_config_core_v3_DataSource *msg, upb_StringView value) { - const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_DataSource_set_watched_directory(envoy_config_core_v3_DataSource *msg, envoy_config_core_v3_WatchedDirectory* value) { + const upb_MiniTableField field = {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_DataSource_mutable_watched_directory(envoy_config_core_v3_DataSource* msg, upb_Arena* arena) { + struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_config_core_v3_DataSource_watched_directory(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_Message_New(&envoy__config__core__v3__WatchedDirectory_msg_init, arena); + if (sub) envoy_config_core_v3_DataSource_set_watched_directory(msg, sub); + } + return sub; } /* envoy.config.core.v3.RetryPolicy */ @@ -2058,10 +2332,82 @@ UPB_INLINE bool envoy_config_core_v3_RetryPolicy_has_num_retries(const envoy_con const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_retry_on(envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_RetryPolicy_retry_on(const envoy_config_core_v3_RetryPolicy* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_retry_priority(envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_retry_priority(const envoy_config_core_v3_RetryPolicy* msg) { + const envoy_config_core_v3_RetryPolicy_RetryPriority* default_val = NULL; + const envoy_config_core_v3_RetryPolicy_RetryPriority* ret; + const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_RetryPolicy_has_retry_priority(const envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_retry_host_predicate(envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* const* envoy_config_core_v3_RetryPolicy_retry_host_predicate(const envoy_config_core_v3_RetryPolicy* msg, size_t* size) { + const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* const*)upb_Array_DataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE const upb_Array* _envoy_config_core_v3_RetryPolicy_retry_host_predicate_upb_array(const envoy_config_core_v3_RetryPolicy* msg, size_t* size) { + const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE upb_Array* _envoy_config_core_v3_RetryPolicy_retry_host_predicate_mutable_upb_array(envoy_config_core_v3_RetryPolicy* msg, size_t* size, upb_Arena* arena) { + const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), + &field, arena); + if (size) { + *size = arr ? arr->UPB_PRIVATE(size) : 0; + } + return arr; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_clear_host_selection_retry_max_attempts(envoy_config_core_v3_RetryPolicy* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int64_t envoy_config_core_v3_RetryPolicy_host_selection_retry_max_attempts(const envoy_config_core_v3_RetryPolicy* msg) { + int64_t default_val = (int64_t)0ll; + int64_t ret; + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_retry_back_off(envoy_config_core_v3_RetryPolicy *msg, struct envoy_config_core_v3_BackoffStrategy* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_RetryPolicy_mutable_retry_back_off(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) { struct envoy_config_core_v3_BackoffStrategy* sub = (struct envoy_config_core_v3_BackoffStrategy*)envoy_config_core_v3_RetryPolicy_retry_back_off(msg); @@ -2073,7 +2419,7 @@ UPB_INLINE struct envoy_config_core_v3_BackoffStrategy* envoy_config_core_v3_Ret } UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_num_retries(envoy_config_core_v3_RetryPolicy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RetryPolicy_mutable_num_retries(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_RetryPolicy_num_retries(msg); @@ -2083,6 +2429,238 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RetryPolicy_ } return sub; } +UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_retry_on(envoy_config_core_v3_RetryPolicy *msg, upb_StringView value) { + const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_retry_priority(envoy_config_core_v3_RetryPolicy *msg, envoy_config_core_v3_RetryPolicy_RetryPriority* value) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_mutable_retry_priority(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) { + struct envoy_config_core_v3_RetryPolicy_RetryPriority* sub = (struct envoy_config_core_v3_RetryPolicy_RetryPriority*)envoy_config_core_v3_RetryPolicy_retry_priority(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_RetryPolicy_RetryPriority*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, arena); + if (sub) envoy_config_core_v3_RetryPolicy_set_retry_priority(msg, sub); + } + return sub; +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate** envoy_config_core_v3_RetryPolicy_mutable_retry_host_predicate(envoy_config_core_v3_RetryPolicy* msg, size_t* size) { + upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); + if (arr) { + if (size) *size = arr->UPB_PRIVATE(size); + return (envoy_config_core_v3_RetryPolicy_RetryHostPredicate**)upb_Array_MutableDataPtr(arr); + } else { + if (size) *size = 0; + return NULL; + } +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate** envoy_config_core_v3_RetryPolicy_resize_retry_host_predicate(envoy_config_core_v3_RetryPolicy* msg, size_t size, upb_Arena* arena) { + upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (envoy_config_core_v3_RetryPolicy_RetryHostPredicate**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), + &field, size, arena); +} +UPB_INLINE struct envoy_config_core_v3_RetryPolicy_RetryHostPredicate* envoy_config_core_v3_RetryPolicy_add_retry_host_predicate(envoy_config_core_v3_RetryPolicy* msg, upb_Arena* arena) { + upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Array* arr = upb_Message_GetOrCreateMutableArray( + UPB_UPCAST(msg), &field, arena); + if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( + arr, arr->UPB_PRIVATE(size) + 1, arena)) { + return NULL; + } + struct envoy_config_core_v3_RetryPolicy_RetryHostPredicate* sub = (struct envoy_config_core_v3_RetryPolicy_RetryHostPredicate*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, arena); + if (!arr || !sub) return NULL; + UPB_PRIVATE(_upb_Array_Set) + (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); + return sub; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_set_host_selection_retry_max_attempts(envoy_config_core_v3_RetryPolicy *msg, int64_t value) { + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.core.v3.RetryPolicy.RetryPriority */ + +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_RetryPriority_new(upb_Arena* arena) { + return (envoy_config_core_v3_RetryPolicy_RetryPriority*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_RetryPriority_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_RetryPolicy_RetryPriority* ret = envoy_config_core_v3_RetryPolicy_RetryPriority_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryPriority* envoy_config_core_v3_RetryPolicy_RetryPriority_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_RetryPolicy_RetryPriority* ret = envoy_config_core_v3_RetryPolicy_RetryPriority_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_RetryPolicy_RetryPriority_serialize(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_RetryPolicy_RetryPriority_serialize_ex(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, options, arena, &ptr, len); + return ptr; +} +typedef enum { + envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_typed_config = 2, + envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_NOT_SET = 0 +} envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_oneofcases; +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_oneofcases envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_case(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (envoy_config_core_v3_RetryPolicy_RetryPriority_config_type_oneofcases)upb_Message_WhichOneofFieldNumber( + UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_clear_name(envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_RetryPolicy_RetryPriority_name(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_clear_typed_config(envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_RetryPriority_typed_config(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const struct google_protobuf_Any* default_val = NULL; + const struct google_protobuf_Any* ret; + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_RetryPolicy_RetryPriority_has_typed_config(const envoy_config_core_v3_RetryPolicy_RetryPriority* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_set_name(envoy_config_core_v3_RetryPolicy_RetryPriority *msg, upb_StringView value) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryPriority_set_typed_config(envoy_config_core_v3_RetryPolicy_RetryPriority *msg, struct google_protobuf_Any* value) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_RetryPriority_mutable_typed_config(envoy_config_core_v3_RetryPolicy_RetryPriority* msg, upb_Arena* arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_RetryPolicy_RetryPriority_typed_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena); + if (sub) envoy_config_core_v3_RetryPolicy_RetryPriority_set_typed_config(msg, sub); + } + return sub; +} + +/* envoy.config.core.v3.RetryPolicy.RetryHostPredicate */ + +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_new(upb_Arena* arena) { + return (envoy_config_core_v3_RetryPolicy_RetryHostPredicate*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, arena); +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_core_v3_RetryPolicy_RetryHostPredicate* ret = envoy_config_core_v3_RetryPolicy_RetryHostPredicate_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_core_v3_RetryPolicy_RetryHostPredicate* ret = envoy_config_core_v3_RetryPolicy_RetryHostPredicate_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_serialize(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_serialize_ex(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, options, arena, &ptr, len); + return ptr; +} +typedef enum { + envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_typed_config = 2, + envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_NOT_SET = 0 +} envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_oneofcases; +UPB_INLINE envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_oneofcases envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_case(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return (envoy_config_core_v3_RetryPolicy_RetryHostPredicate_config_type_oneofcases)upb_Message_WhichOneofFieldNumber( + UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_clear_name(envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_config_core_v3_RetryPolicy_RetryHostPredicate_name(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_clear_typed_config(envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_typed_config(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const struct google_protobuf_Any* default_val = NULL; + const struct google_protobuf_Any* ret; + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_RetryPolicy_RetryHostPredicate_has_typed_config(const envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_set_name(envoy_config_core_v3_RetryPolicy_RetryHostPredicate *msg, upb_StringView value) { + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_RetryPolicy_RetryHostPredicate_set_typed_config(envoy_config_core_v3_RetryPolicy_RetryHostPredicate *msg, struct google_protobuf_Any* value) { + const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_RetryPolicy_RetryHostPredicate_mutable_typed_config(envoy_config_core_v3_RetryPolicy_RetryHostPredicate* msg, upb_Arena* arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_RetryPolicy_RetryHostPredicate_typed_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_Message_New(&google__protobuf__Any_msg_init, arena); + if (sub) envoy_config_core_v3_RetryPolicy_RetryHostPredicate_set_typed_config(msg, sub); + } + return sub; +} /* envoy.config.core.v3.RemoteDataSource */ @@ -2167,7 +2745,7 @@ UPB_INLINE bool envoy_config_core_v3_RemoteDataSource_has_retry_policy(const env UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_http_uri(envoy_config_core_v3_RemoteDataSource *msg, struct envoy_config_core_v3_HttpUri* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_RemoteDataSource_mutable_http_uri(envoy_config_core_v3_RemoteDataSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpUri* sub = (struct envoy_config_core_v3_HttpUri*)envoy_config_core_v3_RemoteDataSource_http_uri(msg); @@ -2179,11 +2757,11 @@ UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_RemoteDataS } UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_sha256(envoy_config_core_v3_RemoteDataSource *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_RemoteDataSource_set_retry_policy(envoy_config_core_v3_RemoteDataSource *msg, envoy_config_core_v3_RetryPolicy* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_RemoteDataSource_mutable_retry_policy(envoy_config_core_v3_RemoteDataSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_config_core_v3_RemoteDataSource_retry_policy(msg); @@ -2275,7 +2853,7 @@ UPB_INLINE bool envoy_config_core_v3_AsyncDataSource_has_remote(const envoy_conf UPB_INLINE void envoy_config_core_v3_AsyncDataSource_set_local(envoy_config_core_v3_AsyncDataSource *msg, envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_AsyncDataSource_mutable_local(envoy_config_core_v3_AsyncDataSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_AsyncDataSource_local(msg); @@ -2287,7 +2865,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_AsyncDat } UPB_INLINE void envoy_config_core_v3_AsyncDataSource_set_remote(envoy_config_core_v3_AsyncDataSource *msg, envoy_config_core_v3_RemoteDataSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RemoteDataSource* envoy_config_core_v3_AsyncDataSource_mutable_remote(envoy_config_core_v3_AsyncDataSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_RemoteDataSource* sub = (struct envoy_config_core_v3_RemoteDataSource*)envoy_config_core_v3_AsyncDataSource_remote(msg); @@ -2374,11 +2952,11 @@ UPB_INLINE bool envoy_config_core_v3_TransportSocket_has_typed_config(const envo UPB_INLINE void envoy_config_core_v3_TransportSocket_set_name(envoy_config_core_v3_TransportSocket *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_TransportSocket_set_typed_config(envoy_config_core_v3_TransportSocket *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TransportSocket_mutable_typed_config(envoy_config_core_v3_TransportSocket* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_TransportSocket_typed_config(msg); @@ -2456,7 +3034,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_RuntimeFractionalPercent_runtime_ UPB_INLINE void envoy_config_core_v3_RuntimeFractionalPercent_set_default_value(envoy_config_core_v3_RuntimeFractionalPercent *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_core_v3_RuntimeFractionalPercent_mutable_default_value(envoy_config_core_v3_RuntimeFractionalPercent* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_core_v3_RuntimeFractionalPercent_default_value(msg); @@ -2468,7 +3046,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_core_v3_RuntimeF } UPB_INLINE void envoy_config_core_v3_RuntimeFractionalPercent_set_runtime_key(envoy_config_core_v3_RuntimeFractionalPercent *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.ControlPlane */ @@ -2522,7 +3100,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_ControlPlane_identifier(const env UPB_INLINE void envoy_config_core_v3_ControlPlane_set_identifier(envoy_config_core_v3_ControlPlane *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c index 970af4d9bd..5a71016b20 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__core__v3__Locality_msg_init = { NULL, &envoy_config_core_v3_Locality__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Locality", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -58,6 +61,9 @@ const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = { &envoy_config_core_v3_BuildVersion_submsgs[0], &envoy_config_core_v3_BuildVersion__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.BuildVersion", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_Extension_submsgs[1] = { @@ -77,6 +83,9 @@ const upb_MiniTable envoy__config__core__v3__Extension_msg_init = { &envoy_config_core_v3_Extension_submsgs[0], &envoy_config_core_v3_Extension__fields[0], UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Extension", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -116,6 +125,9 @@ const upb_MiniTable envoy__config__core__v3__Node_msg_init = { &envoy_config_core_v3_Node_submsgs[0], &envoy_config_core_v3_Node__fields[0], UPB_SIZE(72, 128), 11, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Node", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -149,6 +161,9 @@ const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_in &envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[0], &envoy_config_core_v3_Node_DynamicParametersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Node.DynamicParametersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -169,6 +184,9 @@ const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = { &envoy_config_core_v3_Metadata_submsgs[0], &envoy_config_core_v3_Metadata__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Metadata", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = { @@ -184,6 +202,9 @@ const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_i &envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[0], &envoy_config_core_v3_Metadata_FilterMetadataEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Metadata.FilterMetadataEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -203,6 +224,9 @@ const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_ &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[0], &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Metadata.TypedFilterMetadataEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -218,6 +242,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init = { NULL, &envoy_config_core_v3_RuntimeUInt32__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimeUInt32", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -239,6 +266,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init = { &envoy_config_core_v3_RuntimePercent_submsgs[0], &envoy_config_core_v3_RuntimePercent__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimePercent", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -256,6 +286,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init = { NULL, &envoy_config_core_v3_RuntimeDouble__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimeDouble", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -277,6 +310,77 @@ const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init = { &envoy_config_core_v3_RuntimeFeatureFlag_submsgs[0], &envoy_config_core_v3_RuntimeFeatureFlag__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimeFeatureFlag", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001800003f000012, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableField envoy_config_core_v3_KeyValue__fields[2] = { + {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__KeyValue_msg_init = { + NULL, + &envoy_config_core_v3_KeyValue__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.KeyValue", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000800003f00000a, &upb_pss_1bt}, + {0x001800003f000012, &upb_psb_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub envoy_config_core_v3_KeyValueAppend_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValue_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_KeyValueAppend__fields[2] = { + {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init = { + &envoy_config_core_v3_KeyValueAppend_submsgs[0], + &envoy_config_core_v3_KeyValueAppend__fields[0], + 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.KeyValueAppend", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000c00003f000010, &upb_psv4_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub envoy_config_core_v3_KeyValueMutation_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValueAppend_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_KeyValueMutation__fields[2] = { + {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__KeyValueMutation_msg_init = { + &envoy_config_core_v3_KeyValueMutation_submsgs[0], + &envoy_config_core_v3_KeyValueMutation__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.KeyValueMutation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -294,6 +398,9 @@ const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init = { NULL, &envoy_config_core_v3_QueryParameter__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.QueryParameter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -312,6 +419,9 @@ const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init = { NULL, &envoy_config_core_v3_HeaderValue__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HeaderValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -336,6 +446,9 @@ const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = { &envoy_config_core_v3_HeaderValueOption_submsgs[0], &envoy_config_core_v3_HeaderValueOption__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HeaderValueOption", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -360,6 +473,9 @@ const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init = { &envoy_config_core_v3_HeaderMap_submsgs[0], &envoy_config_core_v3_HeaderMap__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HeaderMap", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -374,49 +490,127 @@ const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init = { NULL, &envoy_config_core_v3_WatchedDirectory__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.WatchedDirectory", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, }) }; -static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[4] = { - {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableSub envoy_config_core_v3_DataSource_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[5] = { + {1, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = { - NULL, + &envoy_config_core_v3_DataSource_submsgs[0], &envoy_config_core_v3_DataSource__fields[0], - UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.DataSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x001000080100000a, &upb_pos_1bt}, - {0x0010000802000012, &upb_pob_1bt}, - {0x001000080300001a, &upb_pos_1bt}, - {0x0010000804000022, &upb_pos_1bt}, + {0x0010000c0100000a, &upb_pos_1bt}, + {0x0010000c02000012, &upb_pob_1bt}, + {0x0010000c0300001a, &upb_pos_1bt}, + {0x0010000c04000022, &upb_pos_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; -static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_submsgs[2] = { +static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BackoffStrategy_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[2] = { +static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[6] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(24, 56), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = { &envoy_config_core_v3_RetryPolicy_submsgs[0], &envoy_config_core_v3_RetryPolicy__fields[0], - UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, + UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RetryPolicy", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x002000003f00001a, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x003800003f03002a, &upb_prm_1bt_max64b}, + {0x004000003f000030, &upb_psv8_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryPriority__fields[2] = { + {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init = { + &envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[0], + &envoy_config_core_v3_RetryPolicy_RetryPriority__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RetryPolicy.RetryPriority", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000003f00000a, &upb_pss_1bt}, + {0x0020000802000012, &upb_pom_1bt_maxmaxb}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + +static const upb_MiniTableSub envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init}, +}; + +static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryHostPredicate__fields[2] = { + {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init = { + &envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[0], + &envoy_config_core_v3_RetryPolicy_RetryHostPredicate__fields[0], + UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RetryPolicy.RetryHostPredicate", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000003f00000a, &upb_pss_1bt}, + {0x0020000802000012, &upb_pom_1bt_maxmaxb}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) }; static const upb_MiniTableSub envoy_config_core_v3_RemoteDataSource_submsgs[2] = { @@ -434,6 +628,9 @@ const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = { &envoy_config_core_v3_RemoteDataSource_submsgs[0], &envoy_config_core_v3_RemoteDataSource__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RemoteDataSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -456,6 +653,9 @@ const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = { &envoy_config_core_v3_AsyncDataSource_submsgs[0], &envoy_config_core_v3_AsyncDataSource__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.AsyncDataSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -477,6 +677,9 @@ const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = { &envoy_config_core_v3_TransportSocket_submsgs[0], &envoy_config_core_v3_TransportSocket__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.TransportSocket", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -498,6 +701,9 @@ const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init = &envoy_config_core_v3_RuntimeFractionalPercent_submsgs[0], &envoy_config_core_v3_RuntimeFractionalPercent__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RuntimeFractionalPercent", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -514,13 +720,16 @@ const upb_MiniTable envoy__config__core__v3__ControlPlane_msg_init = { NULL, &envoy_config_core_v3_ControlPlane__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ControlPlane", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, }) }; -static const upb_MiniTable *messages_layout[24] = { +static const upb_MiniTable *messages_layout[29] = { &envoy__config__core__v3__Locality_msg_init, &envoy__config__core__v3__BuildVersion_msg_init, &envoy__config__core__v3__Extension_msg_init, @@ -533,6 +742,9 @@ static const upb_MiniTable *messages_layout[24] = { &envoy__config__core__v3__RuntimePercent_msg_init, &envoy__config__core__v3__RuntimeDouble_msg_init, &envoy__config__core__v3__RuntimeFeatureFlag_msg_init, + &envoy__config__core__v3__KeyValue_msg_init, + &envoy__config__core__v3__KeyValueAppend_msg_init, + &envoy__config__core__v3__KeyValueMutation_msg_init, &envoy__config__core__v3__QueryParameter_msg_init, &envoy__config__core__v3__HeaderValue_msg_init, &envoy__config__core__v3__HeaderValueOption_msg_init, @@ -540,6 +752,8 @@ static const upb_MiniTable *messages_layout[24] = { &envoy__config__core__v3__WatchedDirectory_msg_init, &envoy__config__core__v3__DataSource_msg_init, &envoy__config__core__v3__RetryPolicy_msg_init, + &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init, + &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init, &envoy__config__core__v3__RemoteDataSource_msg_init, &envoy__config__core__v3__AsyncDataSource_msg_init, &envoy__config__core__v3__TransportSocket_msg_init, @@ -551,7 +765,7 @@ const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout = { messages_layout, NULL, NULL, - 24, + 29, 0, 0, }; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h index 0db4cef77a..aa613f8aa0 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/base.upb_minitable.h @@ -29,6 +29,9 @@ extern const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init; extern const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init; extern const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init; extern const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init; +extern const upb_MiniTable envoy__config__core__v3__KeyValue_msg_init; +extern const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init; +extern const upb_MiniTable envoy__config__core__v3__KeyValueMutation_msg_init; extern const upb_MiniTable envoy__config__core__v3__QueryParameter_msg_init; extern const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init; extern const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init; @@ -36,6 +39,8 @@ extern const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init; extern const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init; extern const upb_MiniTable envoy__config__core__v3__DataSource_msg_init; extern const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init; +extern const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init; +extern const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init; extern const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init; extern const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init; extern const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h index d80790375c..4b5f4faa0a 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb.h @@ -283,7 +283,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_ApiConfigSource_config_validators_mu UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_api_type(envoy_config_core_v3_ApiConfigSource *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_core_v3_ApiConfigSource_mutable_cluster_names(envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -315,7 +315,7 @@ UPB_INLINE bool envoy_config_core_v3_ApiConfigSource_add_cluster_names(envoy_con } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_refresh_delay(envoy_config_core_v3_ApiConfigSource *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource_mutable_refresh_delay(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ApiConfigSource_refresh_delay(msg); @@ -357,7 +357,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_ApiConf } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_request_timeout(envoy_config_core_v3_ApiConfigSource *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource_mutable_request_timeout(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ApiConfigSource_request_timeout(msg); @@ -369,7 +369,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ApiConfigSource } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_rate_limit_settings(envoy_config_core_v3_ApiConfigSource *msg, envoy_config_core_v3_RateLimitSettings* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_ApiConfigSource_mutable_rate_limit_settings(envoy_config_core_v3_ApiConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_RateLimitSettings* sub = (struct envoy_config_core_v3_RateLimitSettings*)envoy_config_core_v3_ApiConfigSource_rate_limit_settings(msg); @@ -381,11 +381,11 @@ UPB_INLINE struct envoy_config_core_v3_RateLimitSettings* envoy_config_core_v3_A } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_set_node_on_first_message_only(envoy_config_core_v3_ApiConfigSource *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_ApiConfigSource_set_transport_api_version(envoy_config_core_v3_ApiConfigSource *msg, int32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_v3_ApiConfigSource_mutable_config_validators(envoy_config_core_v3_ApiConfigSource* msg, size_t* size) { upb_MiniTableField field = {9, UPB_SIZE(44, 64), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -507,7 +507,7 @@ UPB_INLINE int32_t envoy_config_core_v3_SelfConfigSource_transport_api_version(c UPB_INLINE void envoy_config_core_v3_SelfConfigSource_set_transport_api_version(envoy_config_core_v3_SelfConfigSource *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.RateLimitSettings */ @@ -581,7 +581,7 @@ UPB_INLINE bool envoy_config_core_v3_RateLimitSettings_has_fill_rate(const envoy UPB_INLINE void envoy_config_core_v3_RateLimitSettings_set_max_tokens(envoy_config_core_v3_RateLimitSettings *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RateLimitSettings_mutable_max_tokens(envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_RateLimitSettings_max_tokens(msg); @@ -593,7 +593,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_RateLimitSet } UPB_INLINE void envoy_config_core_v3_RateLimitSettings_set_fill_rate(envoy_config_core_v3_RateLimitSettings *msg, struct google_protobuf_DoubleValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_core_v3_RateLimitSettings_mutable_fill_rate(envoy_config_core_v3_RateLimitSettings* msg, upb_Arena* arena) { struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_core_v3_RateLimitSettings_fill_rate(msg); @@ -671,11 +671,11 @@ UPB_INLINE bool envoy_config_core_v3_PathConfigSource_has_watched_directory(cons UPB_INLINE void envoy_config_core_v3_PathConfigSource_set_path(envoy_config_core_v3_PathConfigSource *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_PathConfigSource_set_watched_directory(envoy_config_core_v3_PathConfigSource *msg, struct envoy_config_core_v3_WatchedDirectory* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_config_core_v3_PathConfigSource_mutable_watched_directory(envoy_config_core_v3_PathConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_config_core_v3_PathConfigSource_watched_directory(msg); @@ -878,11 +878,11 @@ UPB_INLINE bool envoy_config_core_v3_ConfigSource_has_path_config_source(const e UPB_INLINE void envoy_config_core_v3_ConfigSource_set_path(envoy_config_core_v3_ConfigSource *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_api_config_source(envoy_config_core_v3_ConfigSource *msg, envoy_config_core_v3_ApiConfigSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_ConfigSource_mutable_api_config_source(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_core_v3_ConfigSource_api_config_source(msg); @@ -894,7 +894,7 @@ UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_core_v3_Con } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_ads(envoy_config_core_v3_ConfigSource *msg, envoy_config_core_v3_AggregatedConfigSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_AggregatedConfigSource* envoy_config_core_v3_ConfigSource_mutable_ads(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_AggregatedConfigSource* sub = (struct envoy_config_core_v3_AggregatedConfigSource*)envoy_config_core_v3_ConfigSource_ads(msg); @@ -906,7 +906,7 @@ UPB_INLINE struct envoy_config_core_v3_AggregatedConfigSource* envoy_config_core } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_initial_fetch_timeout(envoy_config_core_v3_ConfigSource *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 40), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ConfigSource_mutable_initial_fetch_timeout(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_ConfigSource_initial_fetch_timeout(msg); @@ -918,7 +918,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_ConfigSource_mu } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_self(envoy_config_core_v3_ConfigSource *msg, envoy_config_core_v3_SelfConfigSource* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_ConfigSource_mutable_self(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_SelfConfigSource* sub = (struct envoy_config_core_v3_SelfConfigSource*)envoy_config_core_v3_ConfigSource_self(msg); @@ -930,7 +930,7 @@ 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) { const upb_MiniTableField field = {6, UPB_SIZE(20, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_Authority** envoy_config_core_v3_ConfigSource_mutable_authorities(envoy_config_core_v3_ConfigSource* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(24, 48), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -964,7 +964,7 @@ UPB_INLINE struct xds_core_v3_Authority* envoy_config_core_v3_ConfigSource_add_a } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_path_config_source(envoy_config_core_v3_ConfigSource *msg, envoy_config_core_v3_PathConfigSource* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 24), UPB_SIZE(-17, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_PathConfigSource* envoy_config_core_v3_ConfigSource_mutable_path_config_source(envoy_config_core_v3_ConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_PathConfigSource* sub = (struct envoy_config_core_v3_PathConfigSource*)envoy_config_core_v3_ConfigSource_path_config_source(msg); @@ -1090,7 +1090,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_ExtensionConfigSource_type_urls_muta UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_config_source(envoy_config_core_v3_ExtensionConfigSource *msg, envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_core_v3_ExtensionConfigSource_mutable_config_source(envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_core_v3_ExtensionConfigSource_config_source(msg); @@ -1102,7 +1102,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_core_v3_Extens } UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_default_config(envoy_config_core_v3_ExtensionConfigSource *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_ExtensionConfigSource_mutable_default_config(envoy_config_core_v3_ExtensionConfigSource* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_ExtensionConfigSource_default_config(msg); @@ -1114,7 +1114,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_ExtensionConfigSourc } UPB_INLINE void envoy_config_core_v3_ExtensionConfigSource_set_apply_default_config_without_warming(envoy_config_core_v3_ExtensionConfigSource *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_core_v3_ExtensionConfigSource_mutable_type_urls(envoy_config_core_v3_ExtensionConfigSource* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c index 046c4f2cef..079e87514b 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.c @@ -47,6 +47,9 @@ const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init = { &envoy_config_core_v3_ApiConfigSource_submsgs[0], &envoy_config_core_v3_ApiConfigSource__fields[0], UPB_SIZE(48, 72), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ApiConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -71,6 +74,9 @@ const upb_MiniTable envoy__config__core__v3__AggregatedConfigSource_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.AggregatedConfigSource", +#endif }; static const upb_MiniTableField envoy_config_core_v3_SelfConfigSource__fields[1] = { @@ -81,6 +87,9 @@ const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init = { NULL, &envoy_config_core_v3_SelfConfigSource__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SelfConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -101,6 +110,9 @@ const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = { &envoy_config_core_v3_RateLimitSettings_submsgs[0], &envoy_config_core_v3_RateLimitSettings__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.RateLimitSettings", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_PathConfigSource_submsgs[1] = { @@ -116,6 +128,9 @@ const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = { &envoy_config_core_v3_PathConfigSource_submsgs[0], &envoy_config_core_v3_PathConfigSource__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.PathConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -146,6 +161,9 @@ const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = { &envoy_config_core_v3_ConfigSource_submsgs[0], &envoy_config_core_v3_ConfigSource__fields[0], UPB_SIZE(40, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pos_1bt}, @@ -182,6 +200,9 @@ const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init = { &envoy_config_core_v3_ExtensionConfigSource_submsgs[0], &envoy_config_core_v3_ExtensionConfigSource__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ExtensionConfigSource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h index a4ac4fc6fe..75df840700 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb.h @@ -93,7 +93,7 @@ UPB_INLINE bool envoy_config_core_v3_EventServiceConfig_has_grpc_service(const e UPB_INLINE void envoy_config_core_v3_EventServiceConfig_set_grpc_service(envoy_config_core_v3_EventServiceConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_EventServiceConfig_mutable_grpc_service(envoy_config_core_v3_EventServiceConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_core_v3_EventServiceConfig_grpc_service(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c index 2c8e623e41..7447b9d991 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init = { &envoy_config_core_v3_EventServiceConfig_submsgs[0], &envoy_config_core_v3_EventServiceConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.EventServiceConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h index f201dab221..27331c9f62 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb.h @@ -95,11 +95,11 @@ UPB_INLINE bool envoy_config_core_v3_TypedExtensionConfig_has_typed_config(const UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_name(envoy_config_core_v3_TypedExtensionConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_TypedExtensionConfig_set_typed_config(envoy_config_core_v3_TypedExtensionConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig_mutable_typed_config(envoy_config_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_TypedExtensionConfig_typed_config(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c index 188b6e1eff..25fa2c135f 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init = { &envoy_config_core_v3_TypedExtensionConfig_submsgs[0], &envoy_config_core_v3_TypedExtensionConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.TypedExtensionConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h index e32d47daa5..6ced698c81 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb.h @@ -211,7 +211,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_GrpcMethodList_Service_method_names_ UPB_INLINE void envoy_config_core_v3_GrpcMethodList_Service_set_name(envoy_config_core_v3_GrpcMethodList_Service *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_core_v3_GrpcMethodList_Service_mutable_method_names(envoy_config_core_v3_GrpcMethodList_Service* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c index e3c1784e3e..266ad8a027 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcMethodList_msg_init = { &envoy_config_core_v3_GrpcMethodList_submsgs[0], &envoy_config_core_v3_GrpcMethodList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcMethodList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -42,6 +45,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcMethodList__Service_msg_init = NULL, &envoy_config_core_v3_GrpcMethodList_Service__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcMethodList.Service", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h index 1e11aa0bf4..c77f0b5286 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb.h @@ -97,40 +97,40 @@ typedef enum { envoy_config_core_v3_GrpcService_target_specifier_NOT_SET = 0 } envoy_config_core_v3_GrpcService_target_specifier_oneofcases; UPB_INLINE envoy_config_core_v3_GrpcService_target_specifier_oneofcases envoy_config_core_v3_GrpcService_target_specifier_case(const envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_core_v3_GrpcService_target_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_GrpcService_clear_envoy_grpc(envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_GrpcService_envoy_grpc(const envoy_config_core_v3_GrpcService* msg) { const envoy_config_core_v3_GrpcService_EnvoyGrpc* default_val = NULL; const envoy_config_core_v3_GrpcService_EnvoyGrpc* ret; - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_GrpcService_has_envoy_grpc(const envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_GrpcService_clear_google_grpc(envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_GrpcService_google_grpc(const envoy_config_core_v3_GrpcService* msg) { const envoy_config_core_v3_GrpcService_GoogleGrpc* default_val = NULL; const envoy_config_core_v3_GrpcService_GoogleGrpc* ret; - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_GrpcService_has_google_grpc(const envoy_config_core_v3_GrpcService* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_GrpcService_clear_timeout(envoy_config_core_v3_GrpcService* msg) { @@ -181,10 +181,26 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_GrpcService_initial_metadata_mutable } return arr; } +UPB_INLINE void envoy_config_core_v3_GrpcService_clear_retry_policy(envoy_config_core_v3_GrpcService* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcService_retry_policy(const envoy_config_core_v3_GrpcService* msg) { + const struct envoy_config_core_v3_RetryPolicy* default_val = NULL; + const struct envoy_config_core_v3_RetryPolicy* ret; + const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_GrpcService_has_retry_policy(const envoy_config_core_v3_GrpcService* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_core_v3_GrpcService_set_envoy_grpc(envoy_config_core_v3_GrpcService *msg, envoy_config_core_v3_GrpcService_EnvoyGrpc* value) { - const upb_MiniTableField field = {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_v3_GrpcService_mutable_envoy_grpc(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_EnvoyGrpc* sub = (struct envoy_config_core_v3_GrpcService_EnvoyGrpc*)envoy_config_core_v3_GrpcService_envoy_grpc(msg); @@ -195,8 +211,8 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_EnvoyGrpc* envoy_config_core_ return sub; } UPB_INLINE void envoy_config_core_v3_GrpcService_set_google_grpc(envoy_config_core_v3_GrpcService *msg, envoy_config_core_v3_GrpcService_GoogleGrpc* value) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core_v3_GrpcService_mutable_google_grpc(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc*)envoy_config_core_v3_GrpcService_google_grpc(msg); @@ -208,7 +224,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc* envoy_config_core } UPB_INLINE void envoy_config_core_v3_GrpcService_set_timeout(envoy_config_core_v3_GrpcService *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, 16, 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_GrpcService_mutable_timeout(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_GrpcService_timeout(msg); @@ -248,6 +264,18 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_GrpcSer (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); return sub; } +UPB_INLINE void envoy_config_core_v3_GrpcService_set_retry_policy(envoy_config_core_v3_GrpcService *msg, struct envoy_config_core_v3_RetryPolicy* value) { + const upb_MiniTableField field = {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcService_mutable_retry_policy(envoy_config_core_v3_GrpcService* msg, upb_Arena* arena) { + struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_config_core_v3_GrpcService_retry_policy(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_RetryPolicy*)_upb_Message_New(&envoy__config__core__v3__RetryPolicy_msg_init, arena); + if (sub) envoy_config_core_v3_GrpcService_set_retry_policy(msg, sub); + } + return sub; +} /* envoy.config.core.v3.GrpcService.EnvoyGrpc */ @@ -286,25 +314,25 @@ UPB_INLINE char* envoy_config_core_v3_GrpcService_EnvoyGrpc_serialize_ex(const e return ptr; } UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_cluster_name(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { - const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_GrpcService_EnvoyGrpc_cluster_name(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_authority(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_GrpcService_EnvoyGrpc_authority(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -325,18 +353,46 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_EnvoyGrpc_has_retry_policy(cons const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_max_receive_message_length(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_EnvoyGrpc_max_receive_message_length(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + const struct google_protobuf_UInt32Value* default_val = NULL; + const struct google_protobuf_UInt32Value* ret; + const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_GrpcService_EnvoyGrpc_has_max_receive_message_length(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_clear_skip_envoy_headers(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_core_v3_GrpcService_EnvoyGrpc_skip_envoy_headers(const envoy_config_core_v3_GrpcService_EnvoyGrpc* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_cluster_name(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, upb_StringView value) { - const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_authority(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_retry_policy(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, struct envoy_config_core_v3_RetryPolicy* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcService_EnvoyGrpc_mutable_retry_policy(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg, upb_Arena* arena) { struct envoy_config_core_v3_RetryPolicy* sub = (struct envoy_config_core_v3_RetryPolicy*)envoy_config_core_v3_GrpcService_EnvoyGrpc_retry_policy(msg); @@ -346,6 +402,22 @@ UPB_INLINE struct envoy_config_core_v3_RetryPolicy* envoy_config_core_v3_GrpcSer } return sub; } +UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_max_receive_message_length(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, struct google_protobuf_UInt32Value* value) { + const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_EnvoyGrpc_mutable_max_receive_message_length(envoy_config_core_v3_GrpcService_EnvoyGrpc* msg, upb_Arena* arena) { + struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_GrpcService_EnvoyGrpc_max_receive_message_length(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt32Value*)_upb_Message_New(&google__protobuf__UInt32Value_msg_init, arena); + if (sub) envoy_config_core_v3_GrpcService_EnvoyGrpc_set_max_receive_message_length(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_core_v3_GrpcService_EnvoyGrpc_set_skip_envoy_headers(envoy_config_core_v3_GrpcService_EnvoyGrpc *msg, bool value) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.config.core.v3.GrpcService.GoogleGrpc */ @@ -518,11 +590,11 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_has_channel_args(con UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_target_uri(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_channel_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_channel_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_channel_credentials(msg); @@ -564,15 +636,15 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* e } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_stat_prefix(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_credentials_factory_name(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_config(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 80), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_config(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_GrpcService_GoogleGrpc_config(msg); @@ -584,7 +656,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_GrpcService_Googl } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_per_stream_buffer_limit_bytes(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 88), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_per_stream_buffer_limit_bytes(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_GrpcService_GoogleGrpc_per_stream_buffer_limit_bytes(msg); @@ -596,7 +668,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_GrpcService_ } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_set_channel_args(envoy_config_core_v3_GrpcService_GoogleGrpc *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 96), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* envoy_config_core_v3_GrpcService_GoogleGrpc_mutable_channel_args(envoy_config_core_v3_GrpcService_GoogleGrpc* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs*)envoy_config_core_v3_GrpcService_GoogleGrpc_channel_args(msg); @@ -694,7 +766,7 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_has_c UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_root_certs(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_root_certs(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_root_certs(msg); @@ -706,7 +778,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcServ } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_private_key(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_private_key(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_private_key(msg); @@ -718,7 +790,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcServ } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_set_cert_chain(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_mutable_cert_chain(envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_cert_chain(msg); @@ -865,7 +937,7 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_h UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_ssl_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_ssl_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_ssl_credentials(msg); @@ -877,7 +949,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials* en } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_google_default(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *msg, struct google_protobuf_Empty* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_google_default(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) { struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_google_default(msg); @@ -889,7 +961,7 @@ UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_Google } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_set_local_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_mutable_local_credentials(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_GoogleLocalCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_local_credentials(msg); @@ -1066,11 +1138,11 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_has_ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_access_token(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_google_compute_engine(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, struct google_protobuf_Empty* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_google_compute_engine(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_google_compute_engine(msg); @@ -1082,11 +1154,11 @@ UPB_INLINE struct google_protobuf_Empty* envoy_config_core_v3_GrpcService_Google } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_google_refresh_token(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_service_account_jwt_access(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_service_account_jwt_access(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_service_account_jwt_access(msg); @@ -1098,7 +1170,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Se } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_google_iam(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_google_iam(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_google_iam(msg); @@ -1110,7 +1182,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Go } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_from_plugin(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_from_plugin(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_from_plugin(msg); @@ -1122,7 +1194,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Me } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_set_sts_service(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials *msg, envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_mutable_sts_service(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService* sub = (struct envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_sts_service(msg); @@ -1196,11 +1268,11 @@ UPB_INLINE uint64_t envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_set_json_key(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials_set_token_lifetime_seconds(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.GoogleIAMCredentials */ @@ -1266,11 +1338,11 @@ UPB_INLINE upb_StringView envoy_config_core_v3_GrpcService_GoogleGrpc_CallCreden UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_set_authorization_token(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials_set_authority_selector(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.MetadataCredentialsFromPlugin */ @@ -1349,11 +1421,11 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_Meta UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_set_name(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_set_typed_config(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_mutable_typed_config(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_typed_config(msg); @@ -1511,39 +1583,39 @@ UPB_INLINE upb_StringView envoy_config_core_v3_GrpcService_GoogleGrpc_CallCreden UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_token_exchange_service_uri(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_resource(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_audience(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_scope(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_requested_token_type(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_subject_token_path(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(48, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_subject_token_type(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(56, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_actor_token_path(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(64, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService_set_actor_token_type(envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(72, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs */ @@ -1719,11 +1791,11 @@ UPB_INLINE bool envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_ha UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_set_string_value(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value_set_int_value(envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.ArgsEntry */ diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c index 26d102c207..c26c29c47a 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.c @@ -22,28 +22,33 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_submsgs[4] = { +static const upb_MiniTableSub envoy_config_core_v3_GrpcService_submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[4] = { - {1, UPB_SIZE(24, 32), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(24, 32), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[5] = { + {1, UPB_SIZE(28, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(28, 40), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, 16, 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(20, 24), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(24, 32), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = { &envoy_config_core_v3_GrpcService_submsgs[0], &envoy_config_core_v3_GrpcService__fields[0], - UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0020000c0100000a, &upb_pom_1bt_max64b}, - {0x0020000c02010012, &upb_pom_1bt_max128b}, + {0x0028000c0100000a, &upb_pom_1bt_max128b}, + {0x0028000c02010012, &upb_pom_1bt_max128b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f03002a, &upb_prm_1bt_maxmaxb}, @@ -52,25 +57,35 @@ const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[1] = { +static const upb_MiniTableSub envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[3] = { - {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[5] = { + {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = { &envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[0], &envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[0], - UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.EnvoyGrpc", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, {0x002000003f000012, &upb_pss_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000900003f000028, &upb_psb1_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -97,6 +112,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init = &envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc__fields[0], UPB_SIZE(56, 104), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -125,12 +143,18 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredent &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.SslCredentials", +#endif }; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.GoogleLocalCredentials", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = { @@ -149,6 +173,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCre &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelCredentials", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -179,6 +206,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -200,6 +230,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.ServiceAccountJWTAccessCredentials", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -217,6 +250,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.GoogleIAMCredentials", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -238,6 +274,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.MetadataCredentialsFromPlugin", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -262,6 +301,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_StsService__fields[0], UPB_SIZE(80, 152), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.StsService", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -294,6 +336,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs", +#endif }; static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[2] = { @@ -305,6 +350,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg NULL, &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_Value__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -326,6 +374,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[0], &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.ArgsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h index 071c44d83a..a43753f21b 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb.h @@ -15,6 +15,7 @@ #include "envoy/config/core/v3/base.upb_minitable.h" #include "envoy/config/core/v3/event_service_config.upb_minitable.h" #include "envoy/config/core/v3/extension.upb_minitable.h" +#include "envoy/config/core/v3/proxy_protocol.upb_minitable.h" #include "envoy/type/matcher/v3/string.upb_minitable.h" #include "envoy/type/v3/http.upb_minitable.h" #include "envoy/type/v3/range.upb_minitable.h" @@ -45,6 +46,7 @@ typedef struct envoy_config_core_v3_HealthCheck_CustomHealthCheck { upb_Message typedef struct envoy_config_core_v3_HealthCheck_TlsOptions { upb_Message UPB_PRIVATE(base); } envoy_config_core_v3_HealthCheck_TlsOptions; struct envoy_config_core_v3_EventServiceConfig; struct envoy_config_core_v3_HeaderValueOption; +struct envoy_config_core_v3_ProxyProtocolConfig; struct envoy_config_core_v3_TypedExtensionConfig; struct envoy_type_matcher_v3_StringMatcher; struct envoy_type_v3_Int64Range; @@ -208,7 +210,7 @@ typedef enum { 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) { - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_core_v3_HealthCheck_health_checker_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -325,51 +327,51 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_reuse_connection(const envo return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_http_health_check(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_http_health_check(const envoy_config_core_v3_HealthCheck* msg) { const envoy_config_core_v3_HealthCheck_HttpHealthCheck* default_val = NULL; const envoy_config_core_v3_HealthCheck_HttpHealthCheck* ret; - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_http_health_check(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_tcp_health_check(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_tcp_health_check(const envoy_config_core_v3_HealthCheck* msg) { const envoy_config_core_v3_HealthCheck_TcpHealthCheck* default_val = NULL; const envoy_config_core_v3_HealthCheck_TcpHealthCheck* ret; - const upb_MiniTableField field = {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_tcp_health_check(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_grpc_health_check(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_grpc_health_check(const envoy_config_core_v3_HealthCheck* msg) { const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* default_val = NULL; const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* ret; - const upb_MiniTableField field = {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_grpc_health_check(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_no_traffic_interval(envoy_config_core_v3_HealthCheck* msg) { @@ -389,19 +391,19 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_no_traffic_interval(const e return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_custom_health_check(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_custom_health_check(const envoy_config_core_v3_HealthCheck* msg) { const envoy_config_core_v3_HealthCheck_CustomHealthCheck* default_val = NULL; const envoy_config_core_v3_HealthCheck_CustomHealthCheck* ret; - const upb_MiniTableField field = {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_custom_health_check(const envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_unhealthy_interval(envoy_config_core_v3_HealthCheck* msg) { @@ -453,13 +455,13 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_healthy_edge_interval(const return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_event_log_path(envoy_config_core_v3_HealthCheck* msg) { - const upb_MiniTableField field = {17, UPB_SIZE(96, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(100, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_HealthCheck_event_log_path(const envoy_config_core_v3_HealthCheck* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {17, UPB_SIZE(96, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, UPB_SIZE(100, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -600,10 +602,22 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_event_logger_mutable_upb } return arr; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_clear_always_log_health_check_success(envoy_config_core_v3_HealthCheck* msg) { + const upb_MiniTableField field = {26, UPB_SIZE(92, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_core_v3_HealthCheck_always_log_health_check_success(const envoy_config_core_v3_HealthCheck* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {26, UPB_SIZE(92, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_HealthCheck_set_timeout(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_timeout(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_timeout(msg); @@ -615,7 +629,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_interval(msg); @@ -627,7 +641,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_interval_jitter(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_interval_jitter(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_interval_jitter(msg); @@ -639,7 +653,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_threshold(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_unhealthy_threshold(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_unhealthy_threshold(msg); @@ -651,7 +665,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_ } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_healthy_threshold(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 56), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_healthy_threshold(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_healthy_threshold(msg); @@ -663,7 +677,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_ } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_alt_port(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 64), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_mutable_alt_port(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HealthCheck_alt_port(msg); @@ -675,7 +689,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_ } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_reuse_connection(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 72), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HealthCheck_mutable_reuse_connection(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_HealthCheck_reuse_connection(msg); @@ -686,8 +700,8 @@ 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) { - const upb_MiniTableField field = {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -698,8 +712,8 @@ 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) { - const upb_MiniTableField field = {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -710,8 +724,8 @@ 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) { - const upb_MiniTableField field = {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -723,7 +737,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_no_traffic_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {12, UPB_SIZE(40, 80), 71, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_no_traffic_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_interval(msg); @@ -734,8 +748,8 @@ 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) { - const upb_MiniTableField field = {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -747,7 +761,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_conf } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {14, UPB_SIZE(48, 88), 72, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_unhealthy_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_unhealthy_interval(msg); @@ -759,7 +773,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_unhealthy_edge_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {15, UPB_SIZE(52, 96), 73, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_unhealthy_edge_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_unhealthy_edge_interval(msg); @@ -771,7 +785,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_healthy_edge_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {16, UPB_SIZE(56, 104), 74, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_healthy_edge_interval(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_healthy_edge_interval(msg); @@ -782,20 +796,20 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_event_log_path(envoy_config_core_v3_HealthCheck *msg, upb_StringView value) { - const upb_MiniTableField field = {17, UPB_SIZE(96, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {17, UPB_SIZE(100, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_interval_jitter_percent(envoy_config_core_v3_HealthCheck *msg, uint32_t value) { const upb_MiniTableField field = {18, UPB_SIZE(60, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_always_log_health_check_failures(envoy_config_core_v3_HealthCheck *msg, bool value) { const upb_MiniTableField field = {19, UPB_SIZE(64, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_initial_jitter(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {20, UPB_SIZE(68, 128), 75, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_initial_jitter(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_initial_jitter(msg); @@ -807,7 +821,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_tls_options(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_TlsOptions* value) { const upb_MiniTableField field = {21, UPB_SIZE(72, 136), 76, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core_v3_HealthCheck_mutable_tls_options(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_TlsOptions* sub = (struct envoy_config_core_v3_HealthCheck_TlsOptions*)envoy_config_core_v3_HealthCheck_tls_options(msg); @@ -819,7 +833,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_TlsOptions* envoy_config_core } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_event_service(envoy_config_core_v3_HealthCheck *msg, struct envoy_config_core_v3_EventServiceConfig* value) { const upb_MiniTableField field = {22, UPB_SIZE(76, 144), 77, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_HealthCheck_mutable_event_service(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_EventServiceConfig* sub = (struct envoy_config_core_v3_EventServiceConfig*)envoy_config_core_v3_HealthCheck_event_service(msg); @@ -831,7 +845,7 @@ UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_ } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_transport_socket_match_criteria(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {23, UPB_SIZE(80, 152), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_HealthCheck_mutable_transport_socket_match_criteria(envoy_config_core_v3_HealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_HealthCheck_transport_socket_match_criteria(msg); @@ -843,7 +857,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_HealthCheck_mutab } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_no_traffic_healthy_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {24, UPB_SIZE(84, 160), 79, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -883,6 +897,10 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); return sub; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_set_always_log_health_check_success(envoy_config_core_v3_HealthCheck *msg, bool value) { + const upb_MiniTableField field = {26, UPB_SIZE(92, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.config.core.v3.HealthCheck.Payload */ @@ -965,11 +983,11 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_Payload_has_binary(const envoy_ UPB_INLINE void envoy_config_core_v3_HealthCheck_Payload_set_text(envoy_config_core_v3_HealthCheck_Payload *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_Payload_set_binary(envoy_config_core_v3_HealthCheck_Payload *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HealthCheck.HttpHealthCheck */ @@ -1267,15 +1285,15 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_HttpHealthCheck_has_response_bu UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_host(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(52, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_path(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(60, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_send(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, envoy_config_core_v3_HealthCheck_Payload* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_send(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_send(msg); @@ -1405,11 +1423,11 @@ UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_core_v3_HealthCheck_Htt } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_codec_client_type(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, int32_t value) { const upb_MiniTableField field = {10, UPB_SIZE(32, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_service_name_matcher(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {11, UPB_SIZE(36, 96), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_service_name_matcher(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_service_name_matcher(msg); @@ -1451,11 +1469,11 @@ UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_core_v3_HealthCheck_Htt } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_method(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, int32_t value) { const upb_MiniTableField field = {13, UPB_SIZE(44, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_HttpHealthCheck_set_response_buffer_size(envoy_config_core_v3_HealthCheck_HttpHealthCheck *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {14, UPB_SIZE(48, 112), 66, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_HealthCheck_HttpHealthCheck_mutable_response_buffer_size(envoy_config_core_v3_HealthCheck_HttpHealthCheck* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_core_v3_HealthCheck_HttpHealthCheck_response_buffer_size(msg); @@ -1550,10 +1568,26 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_TcpHealthCheck_receive_m } return arr; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_clear_proxy_protocol_config(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_core_v3_HealthCheck_TcpHealthCheck_proxy_protocol_config(const envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg) { + const struct envoy_config_core_v3_ProxyProtocolConfig* default_val = NULL; + const struct envoy_config_core_v3_ProxyProtocolConfig* ret; + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_HealthCheck_TcpHealthCheck_has_proxy_protocol_config(const envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_set_send(envoy_config_core_v3_HealthCheck_TcpHealthCheck *msg, envoy_config_core_v3_HealthCheck_Payload* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3_HealthCheck_TcpHealthCheck_mutable_send(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, upb_Arena* arena) { struct envoy_config_core_v3_HealthCheck_Payload* sub = (struct envoy_config_core_v3_HealthCheck_Payload*)envoy_config_core_v3_HealthCheck_TcpHealthCheck_send(msg); @@ -1593,6 +1627,18 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_Payload* envoy_config_core_v3 (arr, arr->UPB_PRIVATE(size) - 1, &sub, sizeof(sub)); return sub; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_TcpHealthCheck_set_proxy_protocol_config(envoy_config_core_v3_HealthCheck_TcpHealthCheck *msg, struct envoy_config_core_v3_ProxyProtocolConfig* value) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_core_v3_HealthCheck_TcpHealthCheck_mutable_proxy_protocol_config(envoy_config_core_v3_HealthCheck_TcpHealthCheck* msg, upb_Arena* arena) { + struct envoy_config_core_v3_ProxyProtocolConfig* sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)envoy_config_core_v3_HealthCheck_TcpHealthCheck_proxy_protocol_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)_upb_Message_New(&envoy__config__core__v3__ProxyProtocolConfig_msg_init, arena); + if (sub) envoy_config_core_v3_HealthCheck_TcpHealthCheck_set_proxy_protocol_config(msg, sub); + } + return sub; +} /* envoy.config.core.v3.HealthCheck.RedisHealthCheck */ @@ -1645,7 +1691,7 @@ UPB_INLINE upb_StringView envoy_config_core_v3_HealthCheck_RedisHealthCheck_key( UPB_INLINE void envoy_config_core_v3_HealthCheck_RedisHealthCheck_set_key(envoy_config_core_v3_HealthCheck_RedisHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HealthCheck.GrpcHealthCheck */ @@ -1743,11 +1789,11 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HealthCheck_GrpcHealthCheck_initial_ UPB_INLINE void envoy_config_core_v3_HealthCheck_GrpcHealthCheck_set_service_name(envoy_config_core_v3_HealthCheck_GrpcHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_GrpcHealthCheck_set_authority(envoy_config_core_v3_HealthCheck_GrpcHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_core_v3_HealthCheck_GrpcHealthCheck_mutable_initial_metadata(envoy_config_core_v3_HealthCheck_GrpcHealthCheck* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(8, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1856,11 +1902,11 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_CustomHealthCheck_has_typed_con UPB_INLINE void envoy_config_core_v3_HealthCheck_CustomHealthCheck_set_name(envoy_config_core_v3_HealthCheck_CustomHealthCheck *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HealthCheck_CustomHealthCheck_set_typed_config(envoy_config_core_v3_HealthCheck_CustomHealthCheck *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_HealthCheck_CustomHealthCheck_mutable_typed_config(envoy_config_core_v3_HealthCheck_CustomHealthCheck* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_core_v3_HealthCheck_CustomHealthCheck_typed_config(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c index c0071c71f7..5c1b33c1f2 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.c @@ -11,6 +11,7 @@ #include "envoy/config/core/v3/base.upb_minitable.h" #include "envoy/config/core/v3/event_service_config.upb_minitable.h" #include "envoy/config/core/v3/extension.upb_minitable.h" +#include "envoy/config/core/v3/proxy_protocol.upb_minitable.h" #include "envoy/type/matcher/v3/string.upb_minitable.h" #include "envoy/type/v3/http.upb_minitable.h" #include "envoy/type/v3/range.upb_minitable.h" @@ -34,6 +35,9 @@ const upb_MiniTable envoy__config__core__v3__HealthStatusSet_msg_init = { NULL, &envoy_config_core_v3_HealthStatusSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthStatusSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_ppv4_1bt}, @@ -64,7 +68,7 @@ static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_submsgs[21] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[24] = { +static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[25] = { {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -72,15 +76,15 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[24] = { {5, UPB_SIZE(28, 56), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(32, 64), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {7, UPB_SIZE(36, 72), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {9, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {11, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {11, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {12, UPB_SIZE(40, 80), 71, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {13, UPB_SIZE(92, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(96, 176), UPB_SIZE(-45, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {14, UPB_SIZE(48, 88), 72, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {15, UPB_SIZE(52, 96), 73, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {16, UPB_SIZE(56, 104), 74, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {17, UPB_SIZE(96, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {17, UPB_SIZE(100, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {18, UPB_SIZE(60, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {19, UPB_SIZE(64, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {20, UPB_SIZE(68, 128), 75, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -89,12 +93,16 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[24] = { {23, UPB_SIZE(80, 152), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {24, UPB_SIZE(84, 160), 79, 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {25, UPB_SIZE(88, 168), 0, 20, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {26, UPB_SIZE(92, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = { &envoy_config_core_v3_HealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck__fields[0], - UPB_SIZE(104, 184), 24, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(112, 184), 25, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -122,7 +130,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x00a800003f1401ca, &upb_prm_2bt_maxmaxb}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001500003f0001d0, &upb_psb1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -140,6 +148,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init = { NULL, &envoy_config_core_v3_HealthCheck_Payload__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.Payload", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -177,6 +188,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_in &envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_HttpHealthCheck__fields[0], UPB_SIZE(72, 120), 12, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.HttpHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -197,20 +211,25 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_in }) }; -static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[2] = { +static const upb_MiniTableSub envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[2] = { +static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[3] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__HealthCheck__TcpHealthCheck_msg_init = { &envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[0], - UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.TcpHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -227,6 +246,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_i NULL, &envoy_config_core_v3_HealthCheck_RedisHealthCheck__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.RedisHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -247,6 +269,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_in &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_GrpcHealthCheck__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.GrpcHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -268,6 +293,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_ &envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck_CustomHealthCheck__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.CustomHealthCheck", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -284,6 +312,9 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__TlsOptions_msg_init = NULL, &envoy_config_core_v3_HealthCheck_TlsOptions__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HealthCheck.TlsOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h index 8bb6560ce1..c3c668f96a 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb.h @@ -117,7 +117,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_HttpService_request_headers_to_add_m UPB_INLINE void envoy_config_core_v3_HttpService_set_http_uri(envoy_config_core_v3_HttpService *msg, struct envoy_config_core_v3_HttpUri* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpUri* envoy_config_core_v3_HttpService_mutable_http_uri(envoy_config_core_v3_HttpService* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpUri* sub = (struct envoy_config_core_v3_HttpUri*)envoy_config_core_v3_HttpService_http_uri(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c index 4fec6856e6..90cd14f86c 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__config__core__v3__HttpService_msg_init = { &envoy_config_core_v3_HttpService_submsgs[0], &envoy_config_core_v3_HttpService__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HttpService", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h index 576785eeb2..06f281871a 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb.h @@ -121,15 +121,15 @@ UPB_INLINE bool envoy_config_core_v3_HttpUri_has_timeout(const envoy_config_core UPB_INLINE void envoy_config_core_v3_HttpUri_set_uri(envoy_config_core_v3_HttpUri *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HttpUri_set_cluster(envoy_config_core_v3_HttpUri *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HttpUri_set_timeout(envoy_config_core_v3_HttpUri *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpUri_mutable_timeout(envoy_config_core_v3_HttpUri* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpUri_timeout(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c index 977501414c..9af4b82ff1 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__config__core__v3__HttpUri_msg_init = { &envoy_config_core_v3_HttpUri_submsgs[0], &envoy_config_core_v3_HttpUri__fields[0], UPB_SIZE(40, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HttpUri", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h index 286a197f38..a64136a0ee 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb.h @@ -168,7 +168,7 @@ UPB_INLINE bool envoy_config_core_v3_QuicKeepAliveSettings_has_initial_interval( UPB_INLINE void envoy_config_core_v3_QuicKeepAliveSettings_set_max_interval(envoy_config_core_v3_QuicKeepAliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSettings_mutable_max_interval(envoy_config_core_v3_QuicKeepAliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_QuicKeepAliveSettings_max_interval(msg); @@ -180,7 +180,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSe } UPB_INLINE void envoy_config_core_v3_QuicKeepAliveSettings_set_initial_interval(envoy_config_core_v3_QuicKeepAliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicKeepAliveSettings_mutable_initial_interval(envoy_config_core_v3_QuicKeepAliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_QuicKeepAliveSettings_initial_interval(msg); @@ -308,33 +308,49 @@ UPB_INLINE bool envoy_config_core_v3_QuicProtocolOptions_has_connection_keepaliv return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_clear_connection_options(envoy_config_core_v3_QuicProtocolOptions* msg) { - const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_QuicProtocolOptions_connection_options(const envoy_config_core_v3_QuicProtocolOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_clear_client_connection_options(envoy_config_core_v3_QuicProtocolOptions* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_QuicProtocolOptions_client_connection_options(const envoy_config_core_v3_QuicProtocolOptions* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {7, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_clear_idle_network_timeout(envoy_config_core_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_QuicProtocolOptions_idle_network_timeout(const envoy_config_core_v3_QuicProtocolOptions* msg) { + const struct google_protobuf_Duration* default_val = NULL; + const struct google_protobuf_Duration* ret; + const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_core_v3_QuicProtocolOptions_has_idle_network_timeout(const envoy_config_core_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_max_concurrent_streams(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_max_concurrent_streams(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_max_concurrent_streams(msg); @@ -346,7 +362,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocol } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_initial_stream_window_size(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_initial_stream_window_size(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_initial_stream_window_size(msg); @@ -358,7 +374,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocol } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_initial_connection_window_size(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_initial_connection_window_size(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_initial_connection_window_size(msg); @@ -370,7 +386,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocol } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_num_timeouts_to_trigger_port_migration(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocolOptions_mutable_num_timeouts_to_trigger_port_migration(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_QuicProtocolOptions_num_timeouts_to_trigger_port_migration(msg); @@ -382,7 +398,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_QuicProtocol } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_connection_keepalive(envoy_config_core_v3_QuicProtocolOptions *msg, envoy_config_core_v3_QuicKeepAliveSettings* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_v3_QuicProtocolOptions_mutable_connection_keepalive(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_QuicKeepAliveSettings* sub = (struct envoy_config_core_v3_QuicKeepAliveSettings*)envoy_config_core_v3_QuicProtocolOptions_connection_keepalive(msg); @@ -393,12 +409,24 @@ UPB_INLINE struct envoy_config_core_v3_QuicKeepAliveSettings* envoy_config_core_ return sub; } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_connection_options(envoy_config_core_v3_QuicProtocolOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_client_connection_options(envoy_config_core_v3_QuicProtocolOptions *msg, upb_StringView value) { - const upb_MiniTableField field = {7, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_QuicProtocolOptions_set_idle_network_timeout(envoy_config_core_v3_QuicProtocolOptions *msg, struct google_protobuf_Duration* value) { + const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_QuicProtocolOptions_mutable_idle_network_timeout(envoy_config_core_v3_QuicProtocolOptions* msg, upb_Arena* arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_QuicProtocolOptions_idle_network_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena); + if (sub) envoy_config_core_v3_QuicProtocolOptions_set_idle_network_timeout(msg, sub); + } + return sub; } /* envoy.config.core.v3.UpstreamHttpProtocolOptions */ @@ -476,15 +504,15 @@ UPB_INLINE upb_StringView envoy_config_core_v3_UpstreamHttpProtocolOptions_overr UPB_INLINE void envoy_config_core_v3_UpstreamHttpProtocolOptions_set_auto_sni(envoy_config_core_v3_UpstreamHttpProtocolOptions *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_UpstreamHttpProtocolOptions_set_auto_san_validation(envoy_config_core_v3_UpstreamHttpProtocolOptions *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_UpstreamHttpProtocolOptions_set_override_auto_sni_header(envoy_config_core_v3_UpstreamHttpProtocolOptions *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.AlternateProtocolsCacheOptions */ @@ -634,11 +662,11 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_AlternateProtocolsCacheOptions_canon UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_name(envoy_config_core_v3_AlternateProtocolsCacheOptions *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_max_entries(envoy_config_core_v3_AlternateProtocolsCacheOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_AlternateProtocolsCacheOptions_mutable_max_entries(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_AlternateProtocolsCacheOptions_max_entries(msg); @@ -650,7 +678,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_AlternatePro } UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_set_key_value_store_config(envoy_config_core_v3_AlternateProtocolsCacheOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_AlternateProtocolsCacheOptions_mutable_key_value_store_config(envoy_config_core_v3_AlternateProtocolsCacheOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_core_v3_AlternateProtocolsCacheOptions_key_value_store_config(msg); @@ -782,11 +810,11 @@ UPB_INLINE uint32_t envoy_config_core_v3_AlternateProtocolsCacheOptions_Alternat UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_set_hostname(envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry_set_port(envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry *msg, uint32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.HttpProtocolOptions */ @@ -920,7 +948,7 @@ UPB_INLINE bool envoy_config_core_v3_HttpProtocolOptions_has_max_requests_per_co UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_idle_timeout(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_idle_timeout(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_idle_timeout(msg); @@ -932,7 +960,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOpt } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_headers_count(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocolOptions_mutable_max_headers_count(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HttpProtocolOptions_max_headers_count(msg); @@ -944,7 +972,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocol } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_connection_duration(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_max_connection_duration(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_max_connection_duration(msg); @@ -956,7 +984,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOpt } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_stream_duration(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOptions_mutable_max_stream_duration(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HttpProtocolOptions_max_stream_duration(msg); @@ -968,11 +996,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpProtocolOpt } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_headers_with_underscores_action(envoy_config_core_v3_HttpProtocolOptions *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_HttpProtocolOptions_set_max_requests_per_connection(envoy_config_core_v3_HttpProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_HttpProtocolOptions_mutable_max_requests_per_connection(envoy_config_core_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_HttpProtocolOptions_max_requests_per_connection(msg); @@ -1158,7 +1186,7 @@ UPB_INLINE bool envoy_config_core_v3_Http1ProtocolOptions_allow_custom_methods(c UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_absolute_url(envoy_config_core_v3_Http1ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_allow_absolute_url(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_allow_absolute_url(msg); @@ -1170,15 +1198,15 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolO } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_accept_http_10(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_default_host_for_http_10(envoy_config_core_v3_Http1ProtocolOptions *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(44, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_header_key_format(envoy_config_core_v3_Http1ProtocolOptions *msg, envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* envoy_config_core_v3_Http1ProtocolOptions_mutable_header_key_format(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat*)envoy_config_core_v3_Http1ProtocolOptions_header_key_format(msg); @@ -1190,15 +1218,15 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* env } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_enable_trailers(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_chunked_length(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(25, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http1ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_override_stream_error_on_invalid_http_message(msg); @@ -1210,11 +1238,11 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolO } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_send_fully_qualified_url(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_use_balsa_parser(envoy_config_core_v3_Http1ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolOptions_mutable_use_balsa_parser(envoy_config_core_v3_Http1ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http1ProtocolOptions_use_balsa_parser(msg); @@ -1226,7 +1254,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http1ProtocolO } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_set_allow_custom_methods(envoy_config_core_v3_Http1ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {10, UPB_SIZE(40, 13), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat */ @@ -1310,7 +1338,7 @@ UPB_INLINE bool envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_has_st UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_set_proper_case_words(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *msg, envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_mutable_proper_case_words(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords* sub = (struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_ProperCaseWords*)envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_proper_case_words(msg); @@ -1322,7 +1350,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_Prop } UPB_INLINE void envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_set_stateful_formatter(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_mutable_stateful_formatter(envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_stateful_formatter(msg); @@ -1474,7 +1502,7 @@ UPB_INLINE bool envoy_config_core_v3_KeepaliveSettings_has_connection_idle_inter UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_interval(envoy_config_core_v3_KeepaliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_interval(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_interval(msg); @@ -1486,7 +1514,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettin } UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_timeout(envoy_config_core_v3_KeepaliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_timeout(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_timeout(msg); @@ -1498,7 +1526,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettin } UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_interval_jitter(envoy_config_core_v3_KeepaliveSettings *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_KeepaliveSettings_mutable_interval_jitter(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_core_v3_KeepaliveSettings_interval_jitter(msg); @@ -1510,7 +1538,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_KeepaliveSettings_ } UPB_INLINE void envoy_config_core_v3_KeepaliveSettings_set_connection_idle_interval(envoy_config_core_v3_KeepaliveSettings *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_KeepaliveSettings_mutable_connection_idle_interval(envoy_config_core_v3_KeepaliveSettings* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_KeepaliveSettings_connection_idle_interval(msg); @@ -1820,7 +1848,7 @@ UPB_INLINE bool envoy_config_core_v3_Http2ProtocolOptions_has_use_oghttp2_codec( UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_hpack_table_size(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_hpack_table_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_hpack_table_size(msg); @@ -1832,7 +1860,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_concurrent_streams(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_concurrent_streams(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_concurrent_streams(msg); @@ -1844,7 +1872,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_initial_stream_window_size(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_initial_stream_window_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_initial_stream_window_size(msg); @@ -1856,7 +1884,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_initial_connection_window_size(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_initial_connection_window_size(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_initial_connection_window_size(msg); @@ -1868,15 +1896,15 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_allow_connect(envoy_config_core_v3_Http2ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_allow_metadata(envoy_config_core_v3_Http2ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(29, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_outbound_frames(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_outbound_frames(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_outbound_frames(msg); @@ -1888,7 +1916,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_outbound_control_frames(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_outbound_control_frames(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_outbound_control_frames(msg); @@ -1900,7 +1928,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_consecutive_inbound_frames_with_empty_payload(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 64), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_consecutive_inbound_frames_with_empty_payload(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_consecutive_inbound_frames_with_empty_payload(msg); @@ -1912,7 +1940,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_inbound_priority_frames_per_stream(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 72), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_inbound_priority_frames_per_stream(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_inbound_priority_frames_per_stream(msg); @@ -1924,7 +1952,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_max_inbound_window_update_frames_per_data_frame_sent(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_mutable_max_inbound_window_update_frames_per_data_frame_sent(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_max_inbound_window_update_frames_per_data_frame_sent(msg); @@ -1936,7 +1964,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_stream_error_on_invalid_http_messaging(envoy_config_core_v3_Http2ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {12, UPB_SIZE(52, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter** envoy_config_core_v3_Http2ProtocolOptions_mutable_custom_settings_parameters(envoy_config_core_v3_Http2ProtocolOptions* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(56, 88), 0, 9, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1970,7 +1998,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* e } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {14, UPB_SIZE(60, 96), 73, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http2ProtocolOptions_override_stream_error_on_invalid_http_message(msg); @@ -1982,7 +2010,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolO } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_connection_keepalive(envoy_config_core_v3_Http2ProtocolOptions *msg, envoy_config_core_v3_KeepaliveSettings* value) { const upb_MiniTableField field = {15, UPB_SIZE(64, 104), 74, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_Http2ProtocolOptions_mutable_connection_keepalive(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_KeepaliveSettings* sub = (struct envoy_config_core_v3_KeepaliveSettings*)envoy_config_core_v3_Http2ProtocolOptions_connection_keepalive(msg); @@ -1994,7 +2022,7 @@ UPB_INLINE struct envoy_config_core_v3_KeepaliveSettings* envoy_config_core_v3_H } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_set_use_oghttp2_codec(envoy_config_core_v3_Http2ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {16, UPB_SIZE(68, 112), 75, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http2ProtocolOptions_mutable_use_oghttp2_codec(envoy_config_core_v3_Http2ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http2ProtocolOptions_use_oghttp2_codec(msg); @@ -2076,7 +2104,7 @@ UPB_INLINE bool envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_has_ UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_set_identifier(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_mutable_identifier(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_identifier(msg); @@ -2088,7 +2116,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2Protoco } UPB_INLINE void envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_set_value(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_mutable_value(envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_value(msg); @@ -2154,7 +2182,7 @@ UPB_INLINE bool envoy_config_core_v3_GrpcProtocolOptions_has_http2_protocol_opti UPB_INLINE void envoy_config_core_v3_GrpcProtocolOptions_set_http2_protocol_options(envoy_config_core_v3_GrpcProtocolOptions *msg, envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v3_GrpcProtocolOptions_mutable_http2_protocol_options(envoy_config_core_v3_GrpcProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_config_core_v3_GrpcProtocolOptions_http2_protocol_options(msg); @@ -2245,10 +2273,22 @@ UPB_INLINE bool envoy_config_core_v3_Http3ProtocolOptions_allow_extended_connect &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_clear_allow_metadata(envoy_config_core_v3_Http3ProtocolOptions* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_core_v3_Http3ProtocolOptions_allow_metadata(const envoy_config_core_v3_Http3ProtocolOptions* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {6, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_quic_protocol_options(envoy_config_core_v3_Http3ProtocolOptions *msg, envoy_config_core_v3_QuicProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3_Http3ProtocolOptions_mutable_quic_protocol_options(envoy_config_core_v3_Http3ProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_QuicProtocolOptions* sub = (struct envoy_config_core_v3_QuicProtocolOptions*)envoy_config_core_v3_Http3ProtocolOptions_quic_protocol_options(msg); @@ -2260,7 +2300,7 @@ UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_core_v3 } UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http3ProtocolOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http3ProtocolOptions_mutable_override_stream_error_on_invalid_http_message(envoy_config_core_v3_Http3ProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_Http3ProtocolOptions_override_stream_error_on_invalid_http_message(msg); @@ -2272,7 +2312,11 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_Http3ProtocolO } UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_allow_extended_connect(envoy_config_core_v3_Http3ProtocolOptions *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_Http3ProtocolOptions_set_allow_metadata(envoy_config_core_v3_Http3ProtocolOptions *msg, bool value) { + const upb_MiniTableField field = {6, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.SchemeHeaderTransformation */ @@ -2316,30 +2360,46 @@ typedef enum { envoy_config_core_v3_SchemeHeaderTransformation_transformation_NOT_SET = 0 } envoy_config_core_v3_SchemeHeaderTransformation_transformation_oneofcases; UPB_INLINE envoy_config_core_v3_SchemeHeaderTransformation_transformation_oneofcases envoy_config_core_v3_SchemeHeaderTransformation_transformation_case(const envoy_config_core_v3_SchemeHeaderTransformation* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return (envoy_config_core_v3_SchemeHeaderTransformation_transformation_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_clear_scheme_to_overwrite(envoy_config_core_v3_SchemeHeaderTransformation* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_core_v3_SchemeHeaderTransformation_scheme_to_overwrite(const envoy_config_core_v3_SchemeHeaderTransformation* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_core_v3_SchemeHeaderTransformation_has_scheme_to_overwrite(const envoy_config_core_v3_SchemeHeaderTransformation* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_clear_match_upstream(envoy_config_core_v3_SchemeHeaderTransformation* msg) { + const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_core_v3_SchemeHeaderTransformation_match_upstream(const envoy_config_core_v3_SchemeHeaderTransformation* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_set_scheme_to_overwrite(envoy_config_core_v3_SchemeHeaderTransformation *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_set_match_upstream(envoy_config_core_v3_SchemeHeaderTransformation *msg, bool value) { + const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c index 8e2d6cdd35..2ddb41826e 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.c @@ -25,6 +25,9 @@ const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.TcpProtocolOptions", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = { @@ -41,30 +44,38 @@ const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = { &envoy_config_core_v3_QuicKeepAliveSettings_submsgs[0], &envoy_config_core_v3_QuicKeepAliveSettings__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.QuicKeepAliveSettings", +#endif }; -static const upb_MiniTableSub envoy_config_core_v3_QuicProtocolOptions_submsgs[5] = { +static const upb_MiniTableSub envoy_config_core_v3_QuicProtocolOptions_submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicKeepAliveSettings_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields[7] = { +static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields[8] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {6, UPB_SIZE(32, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {7, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(32, 88), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init = { &envoy_config_core_v3_QuicProtocolOptions_submsgs[0], &envoy_config_core_v3_QuicProtocolOptions__fields[0], - UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.QuicProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -87,6 +98,9 @@ const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_ini NULL, &envoy_config_core_v3_UpstreamHttpProtocolOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.UpstreamHttpProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -113,6 +127,9 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_ &envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[0], &envoy_config_core_v3_AlternateProtocolsCacheOptions__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.AlternateProtocolsCacheOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -134,6 +151,9 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__Alt NULL, &envoy_config_core_v3_AlternateProtocolsCacheOptions_AlternateProtocolsCacheEntry__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.AlternateProtocolsCacheOptions.AlternateProtocolsCacheEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -163,6 +183,9 @@ const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = { &envoy_config_core_v3_HttpProtocolOptions_submsgs[0], &envoy_config_core_v3_HttpProtocolOptions__fields[0], UPB_SIZE(40, 56), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.HttpProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -199,6 +222,9 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = { &envoy_config_core_v3_Http1ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http1ProtocolOptions__fields[0], UPB_SIZE(56, 64), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http1ProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -233,6 +259,9 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[0], &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -257,6 +286,9 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http1ProtocolOptions.HeaderKeyFormat.ProperCaseWords", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_KeepaliveSettings_submsgs[4] = { @@ -277,6 +309,9 @@ const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = { &envoy_config_core_v3_KeepaliveSettings_submsgs[0], &envoy_config_core_v3_KeepaliveSettings__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.KeepaliveSettings", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = { @@ -318,6 +353,9 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = { &envoy_config_core_v3_Http2ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http2ProtocolOptions__fields[0], UPB_SIZE(72, 120), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http2ProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -352,6 +390,9 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParam &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[0], &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http2ProtocolOptions.SettingsParameter", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = { @@ -366,6 +407,9 @@ const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = { &envoy_config_core_v3_GrpcProtocolOptions_submsgs[0], &envoy_config_core_v3_GrpcProtocolOptions__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.GrpcProtocolOptions", +#endif }; static const upb_MiniTableSub envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = { @@ -373,16 +417,20 @@ static const upb_MiniTableSub envoy_config_core_v3_Http3ProtocolOptions_submsgs[ {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, }; -static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__fields[3] = { +static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__fields[4] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = { &envoy_config_core_v3_Http3ProtocolOptions_submsgs[0], &envoy_config_core_v3_Http3ProtocolOptions__fields[0], - UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.Http3ProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -390,22 +438,28 @@ const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000028, &upb_psb1_1bt}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000a00003f000030, &upb_psb1_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; -static const upb_MiniTableField envoy_config_core_v3_SchemeHeaderTransformation__fields[1] = { - {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_core_v3_SchemeHeaderTransformation__fields[2] = { + {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__core__v3__SchemeHeaderTransformation_msg_init = { NULL, &envoy_config_core_v3_SchemeHeaderTransformation__fields[0], - UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, + UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SchemeHeaderTransformation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, + {0x000c00003f000010, &upb_psb1_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h index 1b5a53e125..2fb901534f 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb.h @@ -120,7 +120,7 @@ UPB_INLINE upb_Array* _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_tlv_typ UPB_INLINE void envoy_config_core_v3_ProxyProtocolPassThroughTLVs_set_match_type(envoy_config_core_v3_ProxyProtocolPassThroughTLVs *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint32_t* envoy_config_core_v3_ProxyProtocolPassThroughTLVs_mutable_tlv_type(envoy_config_core_v3_ProxyProtocolPassThroughTLVs* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -218,11 +218,11 @@ UPB_INLINE bool envoy_config_core_v3_ProxyProtocolConfig_has_pass_through_tlvs(c UPB_INLINE void envoy_config_core_v3_ProxyProtocolConfig_set_version(envoy_config_core_v3_ProxyProtocolConfig *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_ProxyProtocolConfig_set_pass_through_tlvs(envoy_config_core_v3_ProxyProtocolConfig *msg, envoy_config_core_v3_ProxyProtocolPassThroughTLVs* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_config_core_v3_ProxyProtocolConfig_mutable_pass_through_tlvs(envoy_config_core_v3_ProxyProtocolConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* sub = (struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs*)envoy_config_core_v3_ProxyProtocolConfig_pass_through_tlvs(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c index 64ace5d894..cb90609336 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_in NULL, &envoy_config_core_v3_ProxyProtocolPassThroughTLVs__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ProxyProtocolPassThroughTLVs", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -44,6 +47,9 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init = { &envoy_config_core_v3_ProxyProtocolConfig_submsgs[0], &envoy_config_core_v3_ProxyProtocolConfig__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.ProxyProtocolConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h index 4ebb9716f6..db6fc0bcc4 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb.h @@ -92,11 +92,11 @@ UPB_INLINE bool envoy_config_core_v3_DnsResolverOptions_no_default_search_domain UPB_INLINE void envoy_config_core_v3_DnsResolverOptions_set_use_tcp_for_dns_lookups(envoy_config_core_v3_DnsResolverOptions *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_DnsResolverOptions_set_no_default_search_domain(envoy_config_core_v3_DnsResolverOptions *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.DnsResolutionConfig */ @@ -216,7 +216,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_core_v3_DnsResoluti } UPB_INLINE void envoy_config_core_v3_DnsResolutionConfig_set_dns_resolver_options(envoy_config_core_v3_DnsResolutionConfig *msg, envoy_config_core_v3_DnsResolverOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_DnsResolutionConfig_mutable_dns_resolver_options(envoy_config_core_v3_DnsResolutionConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_DnsResolverOptions* sub = (struct envoy_config_core_v3_DnsResolverOptions*)envoy_config_core_v3_DnsResolutionConfig_dns_resolver_options(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c index a960760b05..d40f74c544 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable envoy__config__core__v3__DnsResolverOptions_msg_init = { NULL, &envoy_config_core_v3_DnsResolverOptions__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.DnsResolverOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -46,6 +49,9 @@ const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init = { &envoy_config_core_v3_DnsResolutionConfig_submsgs[0], &envoy_config_core_v3_DnsResolutionConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.DnsResolutionConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h index deb73f6899..36fea88752 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb.h @@ -163,27 +163,27 @@ UPB_INLINE int32_t envoy_config_core_v3_SocketOption_state(const envoy_config_co UPB_INLINE void envoy_config_core_v3_SocketOption_set_description(envoy_config_core_v3_SocketOption *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_level(envoy_config_core_v3_SocketOption *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 48), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_name(envoy_config_core_v3_SocketOption *msg, int64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 56), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_int_value(envoy_config_core_v3_SocketOption *msg, int64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 16), -9, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_buf_value(envoy_config_core_v3_SocketOption *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SocketOption_set_state(envoy_config_core_v3_SocketOption *msg, int32_t value) { const upb_MiniTableField field = {6, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.SocketOptionsOverride */ diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c index 01215ec7ca..7217e7d8ef 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__core__v3__SocketOption_msg_init = { NULL, &envoy_config_core_v3_SocketOption__fields[0], UPB_SIZE(48, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SocketOption", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -52,6 +55,9 @@ const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init = { &envoy_config_core_v3_SocketOptionsOverride_submsgs[0], &envoy_config_core_v3_SocketOptionsOverride__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SocketOptionsOverride", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h index d9e40b4694..0b20dfa98f 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb.h @@ -85,7 +85,7 @@ UPB_INLINE bool envoy_config_core_v3_JsonFormatOptions_sort_properties(const env UPB_INLINE void envoy_config_core_v3_JsonFormatOptions_set_sort_properties(envoy_config_core_v3_JsonFormatOptions *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.core.v3.SubstitutionFormatString */ @@ -258,11 +258,11 @@ UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_has_json_format_op UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_text_format(envoy_config_core_v3_SubstitutionFormatString *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_json_format(envoy_config_core_v3_SubstitutionFormatString *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 16), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -274,15 +274,15 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_SubstitutionForma } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_omit_empty_values(envoy_config_core_v3_SubstitutionFormatString *msg, bool value) { const upb_MiniTableField field = {3, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_content_type(envoy_config_core_v3_SubstitutionFormatString *msg, upb_StringView value) { const upb_MiniTableField field = {4, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {5, UPB_SIZE(24, 16), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -324,7 +324,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_json_format_options(envoy_config_core_v3_SubstitutionFormatString *msg, envoy_config_core_v3_JsonFormatOptions* value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 56), 64, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_JsonFormatOptions* envoy_config_core_v3_SubstitutionFormatString_mutable_json_format_options(envoy_config_core_v3_SubstitutionFormatString* msg, upb_Arena* arena) { struct envoy_config_core_v3_JsonFormatOptions* sub = (struct envoy_config_core_v3_JsonFormatOptions*)envoy_config_core_v3_SubstitutionFormatString_json_format_options(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c index 42374e39d6..b8d3b0e305 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable envoy__config__core__v3__JsonFormatOptions_msg_init = { NULL, &envoy_config_core_v3_JsonFormatOptions__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.JsonFormatOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -53,6 +56,9 @@ const upb_MiniTable envoy__config__core__v3__SubstitutionFormatString_msg_init = &envoy_config_core_v3_SubstitutionFormatString_submsgs[0], &envoy_config_core_v3_SubstitutionFormatString__fields[0], UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.SubstitutionFormatString", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pos_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h index 4afd2a44df..5e6e5f45f1 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb.h @@ -100,7 +100,7 @@ UPB_INLINE bool envoy_config_core_v3_UdpSocketConfig_has_prefer_gro(const envoy_ UPB_INLINE void envoy_config_core_v3_UdpSocketConfig_set_max_rx_datagram_size(envoy_config_core_v3_UdpSocketConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_UdpSocketConfig_mutable_max_rx_datagram_size(envoy_config_core_v3_UdpSocketConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_core_v3_UdpSocketConfig_max_rx_datagram_size(msg); @@ -112,7 +112,7 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_core_v3_UdpSocketCon } UPB_INLINE void envoy_config_core_v3_UdpSocketConfig_set_prefer_gro(envoy_config_core_v3_UdpSocketConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_UdpSocketConfig_mutable_prefer_gro(envoy_config_core_v3_UdpSocketConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_core_v3_UdpSocketConfig_prefer_gro(msg); diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c index 22de3eb53d..43067151f9 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__config__core__v3__UdpSocketConfig_msg_init = { &envoy_config_core_v3_UdpSocketConfig_submsgs[0], &envoy_config_core_v3_UdpSocketConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.core.v3.UdpSocketConfig", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h index 713d49b6c4..9a1c5025ed 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb.h @@ -167,7 +167,7 @@ UPB_INLINE upb_Map* _envoy_config_endpoint_v3_ClusterLoadAssignment_named_endpoi UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_set_cluster_name(envoy_config_endpoint_v3_ClusterLoadAssignment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints** envoy_config_endpoint_v3_ClusterLoadAssignment_mutable_endpoints(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -201,7 +201,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints* envoy_config_end } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_set_policy(envoy_config_endpoint_v3_ClusterLoadAssignment *msg, envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* envoy_config_endpoint_v3_ClusterLoadAssignment_mutable_policy(envoy_config_endpoint_v3_ClusterLoadAssignment* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* sub = (struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy*)envoy_config_endpoint_v3_ClusterLoadAssignment_policy(msg); @@ -382,7 +382,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOver } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_overprovisioning_factor(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_mutable_overprovisioning_factor(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_overprovisioning_factor(msg); @@ -394,7 +394,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_ClusterL } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_endpoint_stale_after(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_mutable_endpoint_stale_after(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_endpoint_stale_after(msg); @@ -406,7 +406,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterLoad } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_set_weighted_priority_health(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.ClusterLoadAssignment.Policy.DropOverload */ @@ -476,11 +476,11 @@ UPB_INLINE bool envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverlo UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_set_category(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_set_drop_percentage(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_mutable_drop_percentage(envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_drop_percentage(msg); diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c index c4414526bf..1d55450ee8 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init &envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterLoadAssignment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -61,6 +64,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_m &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterLoadAssignment.Policy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -86,6 +92,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__ &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterLoadAssignment.Policy.DropOverload", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -105,6 +114,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEnd &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[0], &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterLoadAssignment.NamedEndpointsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h index 27cd1c9800..55c49b4cba 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb.h @@ -158,7 +158,7 @@ UPB_INLINE upb_Array* _envoy_config_endpoint_v3_Endpoint_additional_addresses_mu UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_address(envoy_config_endpoint_v3_Endpoint *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_mutable_address(envoy_config_endpoint_v3_Endpoint* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_address(msg); @@ -170,7 +170,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoin } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_health_check_config(envoy_config_endpoint_v3_Endpoint *msg, envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_config_endpoint_v3_Endpoint_mutable_health_check_config(envoy_config_endpoint_v3_Endpoint* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* sub = (struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig*)envoy_config_endpoint_v3_Endpoint_health_check_config(msg); @@ -182,7 +182,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* envoy_con } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_set_hostname(envoy_config_endpoint_v3_Endpoint *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_Endpoint_AdditionalAddress** envoy_config_endpoint_v3_Endpoint_mutable_additional_addresses(envoy_config_endpoint_v3_Endpoint* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -306,15 +306,15 @@ UPB_INLINE bool envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_disable_acti UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_port_value(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_hostname(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_address(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_mutable_address(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_address(msg); @@ -326,7 +326,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoin } UPB_INLINE void envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_set_disable_active_health_check(envoy_config_endpoint_v3_Endpoint_HealthCheckConfig *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.Endpoint.AdditionalAddress */ @@ -384,7 +384,7 @@ UPB_INLINE bool envoy_config_endpoint_v3_Endpoint_AdditionalAddress_has_address( UPB_INLINE void envoy_config_endpoint_v3_Endpoint_AdditionalAddress_set_address(envoy_config_endpoint_v3_Endpoint_AdditionalAddress *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Endpoint_AdditionalAddress_mutable_address(envoy_config_endpoint_v3_Endpoint_AdditionalAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_Endpoint_AdditionalAddress_address(msg); @@ -520,7 +520,7 @@ UPB_INLINE bool envoy_config_endpoint_v3_LbEndpoint_has_endpoint_name(const envo UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_endpoint(envoy_config_endpoint_v3_LbEndpoint *msg, envoy_config_endpoint_v3_Endpoint* value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 24), UPB_SIZE(-25, -17), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_LbEndpoint_mutable_endpoint(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_Endpoint* sub = (struct envoy_config_endpoint_v3_Endpoint*)envoy_config_endpoint_v3_LbEndpoint_endpoint(msg); @@ -532,11 +532,11 @@ UPB_INLINE struct envoy_config_endpoint_v3_Endpoint* envoy_config_endpoint_v3_Lb } UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_health_status(envoy_config_endpoint_v3_LbEndpoint *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_metadata(envoy_config_endpoint_v3_LbEndpoint *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LbEndpoint_mutable_metadata(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_endpoint_v3_LbEndpoint_metadata(msg); @@ -548,7 +548,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LbEndp } UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_load_balancing_weight(envoy_config_endpoint_v3_LbEndpoint *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LbEndpoint_mutable_load_balancing_weight(envoy_config_endpoint_v3_LbEndpoint* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LbEndpoint_load_balancing_weight(msg); @@ -560,7 +560,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LbEndpoi } UPB_INLINE void envoy_config_endpoint_v3_LbEndpoint_set_endpoint_name(envoy_config_endpoint_v3_LbEndpoint *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 24), UPB_SIZE(-25, -17), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.LedsClusterLocalityConfig */ @@ -630,7 +630,7 @@ UPB_INLINE upb_StringView envoy_config_endpoint_v3_LedsClusterLocalityConfig_led UPB_INLINE void envoy_config_endpoint_v3_LedsClusterLocalityConfig_set_leds_config(envoy_config_endpoint_v3_LedsClusterLocalityConfig *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_endpoint_v3_LedsClusterLocalityConfig_mutable_leds_config(envoy_config_endpoint_v3_LedsClusterLocalityConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_endpoint_v3_LedsClusterLocalityConfig_leds_config(msg); @@ -642,7 +642,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_endpoint_v3_Le } UPB_INLINE void envoy_config_endpoint_v3_LedsClusterLocalityConfig_set_leds_collection_name(envoy_config_endpoint_v3_LedsClusterLocalityConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.LocalityLbEndpoints */ @@ -687,7 +687,7 @@ typedef enum { envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_NOT_SET = 0 } envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_oneofcases; UPB_INLINE envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_oneofcases envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_case(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_endpoint_v3_LocalityLbEndpoints_lb_config_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -784,41 +784,57 @@ UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_proximity(const return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_clear_load_balancer_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancer_endpoints(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* default_val = NULL; const envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* ret; - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_load_balancer_endpoints(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_clear_leds_cluster_locality_config(envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endpoint_v3_LocalityLbEndpoints_leds_cluster_locality_config(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { const envoy_config_endpoint_v3_LedsClusterLocalityConfig* default_val = NULL; const envoy_config_endpoint_v3_LedsClusterLocalityConfig* ret; - const upb_MiniTableField field = {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_leds_cluster_locality_config(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_clear_metadata(envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { + const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LocalityLbEndpoints_metadata(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { + const struct envoy_config_core_v3_Metadata* default_val = NULL; + const struct envoy_config_core_v3_Metadata* ret; + const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_endpoint_v3_LocalityLbEndpoints_has_metadata(const envoy_config_endpoint_v3_LocalityLbEndpoints* msg) { + const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_locality(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, struct envoy_config_core_v3_Locality* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_locality(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_endpoint_v3_LocalityLbEndpoints_locality(msg); @@ -860,7 +876,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_ } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_load_balancing_weight(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_load_balancing_weight(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancing_weight(msg); @@ -872,11 +888,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Locality } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_priority(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, uint32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_proximity(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_proximity(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_endpoint_v3_LocalityLbEndpoints_proximity(msg); @@ -887,8 +903,8 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_endpoint_v3_Locality return sub; } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_load_balancer_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* value) { - const upb_MiniTableField field = {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_load_balancer_endpoints(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* sub = (struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList*)envoy_config_endpoint_v3_LocalityLbEndpoints_load_balancer_endpoints(msg); @@ -899,8 +915,8 @@ UPB_INLINE struct envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList* e return sub; } UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_leds_cluster_locality_config(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, envoy_config_endpoint_v3_LedsClusterLocalityConfig* value) { - const upb_MiniTableField field = {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_leds_cluster_locality_config(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* sub = (struct envoy_config_endpoint_v3_LedsClusterLocalityConfig*)envoy_config_endpoint_v3_LocalityLbEndpoints_leds_cluster_locality_config(msg); @@ -910,6 +926,18 @@ UPB_INLINE struct envoy_config_endpoint_v3_LedsClusterLocalityConfig* envoy_conf } return sub; } +UPB_INLINE void envoy_config_endpoint_v3_LocalityLbEndpoints_set_metadata(envoy_config_endpoint_v3_LocalityLbEndpoints *msg, struct envoy_config_core_v3_Metadata* value) { + const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_endpoint_v3_LocalityLbEndpoints_mutable_metadata(envoy_config_endpoint_v3_LocalityLbEndpoints* msg, upb_Arena* arena) { + struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_endpoint_v3_LocalityLbEndpoints_metadata(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_Metadata*)_upb_Message_New(&envoy__config__core__v3__Metadata_msg_init, arena); + if (sub) envoy_config_endpoint_v3_LocalityLbEndpoints_set_metadata(msg, sub); + } + return sub; +} /* envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList */ diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c index 5e9c00749b..0a794b1418 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.c @@ -37,6 +37,9 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = { &envoy_config_endpoint_v3_Endpoint_submsgs[0], &envoy_config_endpoint_v3_Endpoint__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.Endpoint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -64,6 +67,9 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[0], &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.Endpoint.HealthCheckConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -88,6 +94,9 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[0], &envoy_config_endpoint_v3_Endpoint_AdditionalAddress__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.Endpoint.AdditionalAddress", +#endif }; static const upb_MiniTableSub envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = { @@ -108,6 +117,9 @@ const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = { &envoy_config_endpoint_v3_LbEndpoint_submsgs[0], &envoy_config_endpoint_v3_LbEndpoint__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.LbEndpoint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800100100000a, &upb_pom_1bt_max64b}, @@ -133,6 +145,9 @@ const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_i &envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[0], &envoy_config_endpoint_v3_LedsClusterLocalityConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.LedsClusterLocalityConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -141,29 +156,34 @@ const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_i }) }; -static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[6] = { +static const upb_MiniTableSub envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[7] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init}, }; -static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fields[7] = { +static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fields[8] = { {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 40), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(24, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(28, 48), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {7, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(36, 56), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {7, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {8, UPB_SIZE(40, 64), UPB_SIZE(-33, -17), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(36, 56), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = { &envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[0], &envoy_config_endpoint_v3_LocalityLbEndpoints__fields[0], - UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.LocalityLbEndpoints", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -172,8 +192,8 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000028, &upb_psv4_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x003800100704003a, &upb_pom_1bt_max64b}, - {0x0038001008050042, &upb_pom_1bt_max64b}, + {0x004000100704003a, &upb_pom_1bt_max64b}, + {0x0040001008050042, &upb_pom_1bt_max64b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -196,6 +216,9 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpoint &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[0], &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h index 303fda0ad5..75d43e45e8 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb.h @@ -16,6 +16,7 @@ #include "envoy/config/core/v3/base.upb_minitable.h" #include "google/protobuf/duration.upb_minitable.h" #include "google/protobuf/struct.upb_minitable.h" +#include "xds/annotations/v3/status.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" #include "validate/validate.upb_minitable.h" @@ -30,6 +31,7 @@ extern "C" { typedef struct envoy_config_endpoint_v3_UpstreamLocalityStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_UpstreamLocalityStats; typedef struct envoy_config_endpoint_v3_UpstreamEndpointStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_UpstreamEndpointStats; typedef struct envoy_config_endpoint_v3_EndpointLoadMetricStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_EndpointLoadMetricStats; +typedef struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats; typedef struct envoy_config_endpoint_v3_ClusterStats { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_ClusterStats; typedef struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests { upb_Message UPB_PRIVATE(base); } envoy_config_endpoint_v3_ClusterStats_DroppedRequests; struct envoy_config_core_v3_Address; @@ -92,37 +94,37 @@ UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_locality(cons return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_successful_requests(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_successful_requests(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_requests_in_progress(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_requests_in_progress(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_error_requests(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(56, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_error_requests(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(56, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -204,21 +206,105 @@ UPB_INLINE upb_Array* _envoy_config_endpoint_v3_UpstreamLocalityStats_upstream_e return arr; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_issued_requests(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { - const upb_MiniTableField field = {8, UPB_SIZE(56, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, 64, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_issued_requests(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { uint64_t default_val = (uint64_t)0ull; uint64_t ret; - const upb_MiniTableField field = {8, UPB_SIZE(56, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {8, 64, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_active_connections(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {9, 72, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_active_connections(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {9, 72, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_new_connections(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {10, 80, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_new_connections(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {10, 80, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_total_fail_connections(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {11, 88, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamLocalityStats_total_fail_connections(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {11, 88, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_cpu_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_cpu_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* default_val = NULL; + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret; + const upb_MiniTableField field = {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_cpu_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_mem_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_mem_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* default_val = NULL; + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret; + const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_mem_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_clear_application_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_application_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* default_val = NULL; + const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret; + const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_endpoint_v3_UpstreamLocalityStats_has_application_utilization(const envoy_config_endpoint_v3_UpstreamLocalityStats* msg) { + const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_locality(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, struct envoy_config_core_v3_Locality* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_locality(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { struct envoy_config_core_v3_Locality* sub = (struct envoy_config_core_v3_Locality*)envoy_config_endpoint_v3_UpstreamLocalityStats_locality(msg); @@ -229,16 +315,16 @@ UPB_INLINE struct envoy_config_core_v3_Locality* envoy_config_endpoint_v3_Upstre return sub; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_successful_requests(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { - const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_requests_in_progress(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { - const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_error_requests(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { - const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(56, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats** envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_load_metric_stats(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -272,7 +358,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_priority(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_UpstreamEndpointStats** envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_upstream_endpoint_stats(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(24, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -305,8 +391,56 @@ UPB_INLINE struct envoy_config_endpoint_v3_UpstreamEndpointStats* envoy_config_e return sub; } UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_issued_requests(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { - const upb_MiniTableField field = {8, UPB_SIZE(56, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {8, 64, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_active_connections(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { + const upb_MiniTableField field = {9, 72, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_new_connections(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { + const upb_MiniTableField field = {10, 80, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_fail_connections(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, uint64_t value) { + const upb_MiniTableField field = {11, 88, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_cpu_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* value) { + const upb_MiniTableField field = {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_cpu_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { + struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)envoy_config_endpoint_v3_UpstreamLocalityStats_cpu_utilization(msg); + if (sub == NULL) { + sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, arena); + if (sub) envoy_config_endpoint_v3_UpstreamLocalityStats_set_cpu_utilization(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_mem_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* value) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_mem_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { + struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)envoy_config_endpoint_v3_UpstreamLocalityStats_mem_utilization(msg); + if (sub == NULL) { + sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, arena); + if (sub) envoy_config_endpoint_v3_UpstreamLocalityStats_set_mem_utilization(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_endpoint_v3_UpstreamLocalityStats_set_application_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats *msg, envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* value) { + const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_application_utilization(envoy_config_endpoint_v3_UpstreamLocalityStats* msg, upb_Arena* arena) { + struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)envoy_config_endpoint_v3_UpstreamLocalityStats_application_utilization(msg); + if (sub == NULL) { + sub = (struct envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, arena); + if (sub) envoy_config_endpoint_v3_UpstreamLocalityStats_set_application_utilization(msg, sub); + } + return sub; } /* envoy.config.endpoint.v3.UpstreamEndpointStats */ @@ -460,7 +594,7 @@ UPB_INLINE uint64_t envoy_config_endpoint_v3_UpstreamEndpointStats_total_issued_ UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_address(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_UpstreamEndpointStats_mutable_address(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_endpoint_v3_UpstreamEndpointStats_address(msg); @@ -472,15 +606,15 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_endpoint_v3_Upstrea } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_successful_requests(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, uint64_t value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_requests_in_progress(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, uint64_t value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_error_requests(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, uint64_t value) { const upb_MiniTableField field = {4, 40, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_EndpointLoadMetricStats** envoy_config_endpoint_v3_UpstreamEndpointStats_mutable_load_metric_stats(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -514,7 +648,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_EndpointLoadMetricStats* envoy_config } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_metadata(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 56), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_endpoint_v3_UpstreamEndpointStats_mutable_metadata(envoy_config_endpoint_v3_UpstreamEndpointStats* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_endpoint_v3_UpstreamEndpointStats_metadata(msg); @@ -526,7 +660,7 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_endpoint_v3_UpstreamEndpo } UPB_INLINE void envoy_config_endpoint_v3_UpstreamEndpointStats_set_total_issued_requests(envoy_config_endpoint_v3_UpstreamEndpointStats *msg, uint64_t value) { const upb_MiniTableField field = {7, UPB_SIZE(48, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.EndpointLoadMetricStats */ @@ -604,15 +738,85 @@ UPB_INLINE double envoy_config_endpoint_v3_EndpointLoadMetricStats_total_metric_ UPB_INLINE void envoy_config_endpoint_v3_EndpointLoadMetricStats_set_metric_name(envoy_config_endpoint_v3_EndpointLoadMetricStats *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_EndpointLoadMetricStats_set_num_requests_finished_with_metric(envoy_config_endpoint_v3_EndpointLoadMetricStats *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_EndpointLoadMetricStats_set_total_metric_value(envoy_config_endpoint_v3_EndpointLoadMetricStats *msg, double value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 32), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* envoy.config.endpoint.v3.UnnamedEndpointLoadMetricStats */ + +UPB_INLINE envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_new(upb_Arena* arena) { + return (envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats*)_upb_Message_New(&envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, arena); +} +UPB_INLINE envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret = envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* ret = envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_serialize(const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_serialize_ex(const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_clear_num_requests_finished_with_metric(envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE uint64_t envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_num_requests_finished_with_metric(const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg) { + uint64_t default_val = (uint64_t)0ull; + uint64_t ret; + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_clear_total_metric_value(envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg) { + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE double envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_total_metric_value(const envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* msg) { + double default_val = 0; + double ret; + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} + +UPB_INLINE void envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_set_num_requests_finished_with_metric(envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats *msg, uint64_t value) { + const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_set_total_metric_value(envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats *msg, double value) { + const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.ClusterStats */ @@ -770,7 +974,7 @@ UPB_INLINE upb_StringView envoy_config_endpoint_v3_ClusterStats_cluster_service_ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_cluster_name(envoy_config_endpoint_v3_ClusterStats *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_endpoint_v3_UpstreamLocalityStats** envoy_config_endpoint_v3_ClusterStats_mutable_upstream_locality_stats(envoy_config_endpoint_v3_ClusterStats* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -804,11 +1008,11 @@ UPB_INLINE struct envoy_config_endpoint_v3_UpstreamLocalityStats* envoy_config_e } UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_total_dropped_requests(envoy_config_endpoint_v3_ClusterStats *msg, uint64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_load_report_interval(envoy_config_endpoint_v3_ClusterStats *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_endpoint_v3_ClusterStats_mutable_load_report_interval(envoy_config_endpoint_v3_ClusterStats* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_endpoint_v3_ClusterStats_load_report_interval(msg); @@ -850,7 +1054,7 @@ UPB_INLINE struct envoy_config_endpoint_v3_ClusterStats_DroppedRequests* envoy_c } UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_set_cluster_service_name(envoy_config_endpoint_v3_ClusterStats *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.endpoint.v3.ClusterStats.DroppedRequests */ @@ -916,11 +1120,11 @@ UPB_INLINE uint64_t envoy_config_endpoint_v3_ClusterStats_DroppedRequests_droppe UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_category(envoy_config_endpoint_v3_ClusterStats_DroppedRequests *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_dropped_count(envoy_config_endpoint_v3_ClusterStats_DroppedRequests *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c index a6a67f9e92..366f1fd678 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.c @@ -12,6 +12,7 @@ #include "envoy/config/core/v3/base.upb_minitable.h" #include "google/protobuf/duration.upb_minitable.h" #include "google/protobuf/struct.upb_minitable.h" +#include "xds/annotations/v3/status.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" #include "validate/validate.upb_minitable.h" @@ -19,27 +20,39 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[3] = { +static const upb_MiniTableSub envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[6] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init}, }; -static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__fields[8] = { +static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__fields[14] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(32, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(40, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(48, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(56, 40), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(16, 48), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(20, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {7, UPB_SIZE(24, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {8, UPB_SIZE(56, 64), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {8, 64, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {9, 72, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {10, 80, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {11, 88, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {12, UPB_SIZE(28, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(32, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {14, UPB_SIZE(36, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init = { &envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[0], &envoy_config_endpoint_v3_UpstreamLocalityStats__fields[0], - UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(96, 120), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.UpstreamLocalityStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -50,9 +63,9 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init {0x000c00003f000030, &upb_psv4_1bt}, {0x003800003f02003a, &upb_prm_1bt_max128b}, {0x004000003f000040, &upb_psv8_1bt}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x004800003f000048, &upb_psv8_1bt}, + {0x005000003f000050, &upb_psv8_1bt}, + {0x005800003f000058, &upb_psv8_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -80,6 +93,9 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init &envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[0], &envoy_config_endpoint_v3_UpstreamEndpointStats__fields[0], UPB_SIZE(56, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.UpstreamEndpointStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -102,6 +118,9 @@ const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_ini NULL, &envoy_config_endpoint_v3_EndpointLoadMetricStats__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.EndpointLoadMetricStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -110,6 +129,26 @@ const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_ini }) }; +static const upb_MiniTableField envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats__fields[2] = { + {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init = { + NULL, + &envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats__fields[0], + 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.UnnamedEndpointLoadMetricStats", +#endif + UPB_FASTTABLE_INIT({ + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000800003f000008, &upb_psv8_1bt}, + {0x001000003f000011, &upb_psf8_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + }) +}; + static const upb_MiniTableSub envoy_config_endpoint_v3_ClusterStats_submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, @@ -129,6 +168,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init = { &envoy_config_endpoint_v3_ClusterStats_submsgs[0], &envoy_config_endpoint_v3_ClusterStats__fields[0], UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -150,6 +192,9 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_m NULL, &envoy_config_endpoint_v3_ClusterStats_DroppedRequests__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.endpoint.v3.ClusterStats.DroppedRequests", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -158,10 +203,11 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_m }) }; -static const upb_MiniTable *messages_layout[5] = { +static const upb_MiniTable *messages_layout[6] = { &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init, &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init, &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init, + &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init, &envoy__config__endpoint__v3__ClusterStats_msg_init, &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init, }; @@ -170,7 +216,7 @@ const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_file_layo messages_layout, NULL, NULL, - 5, + 6, 0, 0, }; diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h index 2bfb250c74..001a307d7a 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/load_report.upb_minitable.h @@ -20,6 +20,7 @@ extern "C" { extern const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init; extern const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init; extern const upb_MiniTable envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init; +extern const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init; extern const upb_MiniTable envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init; diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h index 36d1497a82..10d2aca4ea 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb.h @@ -83,7 +83,7 @@ UPB_INLINE bool envoy_config_listener_v3_ApiListener_has_api_listener(const envo UPB_INLINE void envoy_config_listener_v3_ApiListener_set_api_listener(envoy_config_listener_v3_ApiListener *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ApiListener_mutable_api_listener(envoy_config_listener_v3_ApiListener* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_ApiListener_api_listener(msg); diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c index c72fc8449a..f3b9f37f3a 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__config__listener__v3__ApiListener_msg_init = { &envoy_config_listener_v3_ApiListener_submsgs[0], &envoy_config_listener_v3_ApiListener__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ApiListener", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h index 2f0afb8016..be164b4890 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb.h @@ -142,7 +142,7 @@ UPB_INLINE bool envoy_config_listener_v3_AdditionalAddress_has_socket_options(co UPB_INLINE void envoy_config_listener_v3_AdditionalAddress_set_address(envoy_config_listener_v3_AdditionalAddress *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_AdditionalAddress_mutable_address(envoy_config_listener_v3_AdditionalAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_listener_v3_AdditionalAddress_address(msg); @@ -154,7 +154,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_Additio } UPB_INLINE void envoy_config_listener_v3_AdditionalAddress_set_socket_options(envoy_config_listener_v3_AdditionalAddress *msg, struct envoy_config_core_v3_SocketOptionsOverride* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketOptionsOverride* envoy_config_listener_v3_AdditionalAddress_mutable_socket_options(envoy_config_listener_v3_AdditionalAddress* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketOptionsOverride* sub = (struct envoy_config_core_v3_SocketOptionsOverride*)envoy_config_listener_v3_AdditionalAddress_socket_options(msg); @@ -306,18 +306,18 @@ typedef enum { envoy_config_listener_v3_Listener_listener_specifier_NOT_SET = 0 } envoy_config_listener_v3_Listener_listener_specifier_oneofcases; UPB_INLINE envoy_config_listener_v3_Listener_listener_specifier_oneofcases envoy_config_listener_v3_Listener_listener_specifier_case(const envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_listener_v3_Listener_listener_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_listener_v3_Listener_clear_name(envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(132, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(136, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_listener_v3_Listener_name(const envoy_config_listener_v3_Listener* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(132, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(136, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -739,29 +739,29 @@ UPB_INLINE bool envoy_config_listener_v3_Listener_has_bind_to_port(const envoy_c return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_listener_v3_Listener_clear_internal_listener(envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_config_listener_v3_Listener_internal_listener(const envoy_config_listener_v3_Listener* msg) { const envoy_config_listener_v3_Listener_InternalListenerConfig* default_val = NULL; const envoy_config_listener_v3_Listener_InternalListenerConfig* ret; - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_listener_v3_Listener_has_internal_listener(const envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_listener_v3_Listener_clear_stat_prefix(envoy_config_listener_v3_Listener* msg) { - const upb_MiniTableField field = {28, UPB_SIZE(140, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(144, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_listener_v3_Listener_stat_prefix(const envoy_config_listener_v3_Listener* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {28, UPB_SIZE(140, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {28, UPB_SIZE(144, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -870,14 +870,26 @@ UPB_INLINE bool envoy_config_listener_v3_Listener_has_max_connections_to_accept_ const upb_MiniTableField field = {34, UPB_SIZE(124, 240), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_listener_v3_Listener_clear_bypass_overload_manager(envoy_config_listener_v3_Listener* msg) { + const upb_MiniTableField field = {35, UPB_SIZE(128, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_listener_v3_Listener_bypass_overload_manager(const envoy_config_listener_v3_Listener* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {35, UPB_SIZE(128, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_config_listener_v3_Listener_set_name(envoy_config_listener_v3_Listener *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(132, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(136, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_address(envoy_config_listener_v3_Listener *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_Listener_mutable_address(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_listener_v3_Listener_address(msg); @@ -919,7 +931,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_Listener_set_use_original_dst(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 64), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -931,7 +943,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } 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) { const upb_MiniTableField field = {5, UPB_SIZE(24, 72), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -943,7 +955,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener } UPB_INLINE void envoy_config_listener_v3_Listener_set_metadata(envoy_config_listener_v3_Listener *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 80), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -955,7 +967,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Listen } UPB_INLINE void envoy_config_listener_v3_Listener_set_deprecated_v1(envoy_config_listener_v3_Listener *msg, envoy_config_listener_v3_Listener_DeprecatedV1* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 88), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -967,7 +979,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_l } UPB_INLINE void envoy_config_listener_v3_Listener_set_drain_type(envoy_config_listener_v3_Listener *msg, int32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { upb_MiniTableField field = {9, UPB_SIZE(40, 96), 0, 6, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1001,7 +1013,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilter* envoy_config_listener } UPB_INLINE void envoy_config_listener_v3_Listener_set_transparent(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 104), 69, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1013,7 +1025,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } UPB_INLINE void envoy_config_listener_v3_Listener_set_freebind(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 112), 70, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1025,7 +1037,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } 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) { const upb_MiniTableField field = {12, UPB_SIZE(52, 120), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1067,7 +1079,7 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_listener_v3_Li } UPB_INLINE void envoy_config_listener_v3_Listener_set_listener_filters_timeout(envoy_config_listener_v3_Listener *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {15, UPB_SIZE(60, 136), 72, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1079,15 +1091,15 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_Listener_mu } UPB_INLINE void envoy_config_listener_v3_Listener_set_traffic_direction(envoy_config_listener_v3_Listener *msg, int32_t value) { const upb_MiniTableField field = {16, UPB_SIZE(64, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_continue_on_listener_filters_timeout(envoy_config_listener_v3_Listener *msg, bool value) { const upb_MiniTableField field = {17, UPB_SIZE(68, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {18, UPB_SIZE(72, 144), 73, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1099,7 +1111,7 @@ UPB_INLINE struct envoy_config_listener_v3_UdpListenerConfig* envoy_config_liste } UPB_INLINE void envoy_config_listener_v3_Listener_set_api_listener(envoy_config_listener_v3_Listener *msg, struct envoy_config_listener_v3_ApiListener* value) { const upb_MiniTableField field = {19, UPB_SIZE(76, 152), 74, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1111,7 +1123,7 @@ UPB_INLINE struct envoy_config_listener_v3_ApiListener* envoy_config_listener_v3 } 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) { const upb_MiniTableField field = {20, UPB_SIZE(80, 160), 75, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1123,7 +1135,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig* env } UPB_INLINE void envoy_config_listener_v3_Listener_set_reuse_port(envoy_config_listener_v3_Listener *msg, bool value) { const upb_MiniTableField field = {21, UPB_SIZE(84, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { upb_MiniTableField field = {22, UPB_SIZE(88, 168), 0, 15, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1157,7 +1169,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_listener_v3_ } UPB_INLINE void envoy_config_listener_v3_Listener_set_tcp_backlog_size(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {24, UPB_SIZE(92, 176), 76, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1169,7 +1181,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener } 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) { const upb_MiniTableField field = {25, UPB_SIZE(96, 184), 77, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1181,7 +1193,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_Listener_set_bind_to_port(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {26, UPB_SIZE(100, 192), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1192,8 +1204,8 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_internal_listener(envoy_config_listener_v3_Listener *msg, envoy_config_listener_v3_Listener_InternalListenerConfig* value) { - const upb_MiniTableField field = {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_Listener_InternalListenerConfig* envoy_config_listener_v3_Listener_mutable_internal_listener(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct envoy_config_listener_v3_Listener_InternalListenerConfig* sub = (struct envoy_config_listener_v3_Listener_InternalListenerConfig*)envoy_config_listener_v3_Listener_internal_listener(msg); @@ -1204,12 +1216,12 @@ UPB_INLINE struct envoy_config_listener_v3_Listener_InternalListenerConfig* envo return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_stat_prefix(envoy_config_listener_v3_Listener *msg, upb_StringView value) { - const upb_MiniTableField field = {28, UPB_SIZE(140, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {28, UPB_SIZE(144, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_enable_reuse_port(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {29, UPB_SIZE(108, 216), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_enable_reuse_port(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_enable_reuse_port(msg); @@ -1221,15 +1233,15 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m } UPB_INLINE void envoy_config_listener_v3_Listener_set_enable_mptcp(envoy_config_listener_v3_Listener *msg, bool value) { const upb_MiniTableField field = {30, UPB_SIZE(112, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_ignore_global_conn_limit(envoy_config_listener_v3_Listener *msg, bool value) { const upb_MiniTableField field = {31, UPB_SIZE(113, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Listener_set_filter_chain_matcher(envoy_config_listener_v3_Listener *msg, struct xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {32, UPB_SIZE(116, 224), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_config_listener_v3_Listener_mutable_filter_chain_matcher(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_config_listener_v3_Listener_filter_chain_matcher(msg); @@ -1271,7 +1283,7 @@ UPB_INLINE struct envoy_config_listener_v3_AdditionalAddress* envoy_config_liste } UPB_INLINE void envoy_config_listener_v3_Listener_set_max_connections_to_accept_per_socket_event(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {34, UPB_SIZE(124, 240), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_max_connections_to_accept_per_socket_event(envoy_config_listener_v3_Listener* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_max_connections_to_accept_per_socket_event(msg); @@ -1281,6 +1293,10 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener } return sub; } +UPB_INLINE void envoy_config_listener_v3_Listener_set_bypass_overload_manager(envoy_config_listener_v3_Listener *msg, bool value) { + const upb_MiniTableField field = {35, UPB_SIZE(128, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.config.listener.v3.Listener.DeprecatedV1 */ @@ -1337,7 +1353,7 @@ UPB_INLINE bool envoy_config_listener_v3_Listener_DeprecatedV1_has_bind_to_port( UPB_INLINE void envoy_config_listener_v3_Listener_DeprecatedV1_set_bind_to_port(envoy_config_listener_v3_Listener_DeprecatedV1 *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_DeprecatedV1_mutable_bind_to_port(envoy_config_listener_v3_Listener_DeprecatedV1* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_DeprecatedV1_bind_to_port(msg); @@ -1429,7 +1445,7 @@ UPB_INLINE bool envoy_config_listener_v3_Listener_ConnectionBalanceConfig_has_ex UPB_INLINE void envoy_config_listener_v3_Listener_ConnectionBalanceConfig_set_exact_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig *msg, envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_mutable_exact_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig* msg, upb_Arena* arena) { struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance* sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance*)envoy_config_listener_v3_Listener_ConnectionBalanceConfig_exact_balance(msg); @@ -1441,7 +1457,7 @@ UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig_Exac } UPB_INLINE void envoy_config_listener_v3_Listener_ConnectionBalanceConfig_set_extend_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_Listener_ConnectionBalanceConfig_mutable_extend_balance(envoy_config_listener_v3_Listener_ConnectionBalanceConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_Listener_ConnectionBalanceConfig_extend_balance(msg); diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c index 6744776bf4..36541d5abc 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.c @@ -44,6 +44,9 @@ const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = { &envoy_config_listener_v3_AdditionalAddress_submsgs[0], &envoy_config_listener_v3_AdditionalAddress__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.AdditionalAddress", +#endif }; static const upb_MiniTableSub envoy_config_listener_v3_ListenerCollection_submsgs[1] = { @@ -58,6 +61,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = { &envoy_config_listener_v3_ListenerCollection_submsgs[0], &envoy_config_listener_v3_ListenerCollection__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerCollection", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -91,8 +97,8 @@ static const upb_MiniTableSub envoy_config_listener_v3_Listener_submsgs[24] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, }; -static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[32] = { - {1, UPB_SIZE(132, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[33] = { + {1, UPB_SIZE(136, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(20, 64), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -116,20 +122,24 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[32] = {24, UPB_SIZE(92, 176), 76, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {25, UPB_SIZE(96, 184), 77, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {26, UPB_SIZE(100, 192), 78, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {27, UPB_SIZE(128, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {28, UPB_SIZE(140, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {27, UPB_SIZE(132, 248), UPB_SIZE(-105, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {28, UPB_SIZE(144, 200), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {29, UPB_SIZE(108, 216), 79, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {30, UPB_SIZE(112, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {31, UPB_SIZE(113, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {32, UPB_SIZE(116, 224), 80, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {33, UPB_SIZE(120, 232), 0, 22, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {34, UPB_SIZE(124, 240), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {35, UPB_SIZE(128, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = { &envoy_config_listener_v3_Listener_submsgs[0], &envoy_config_listener_v3_Listener__fields[0], - UPB_SIZE(152, 256), 32, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(152, 256), 33, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -150,7 +160,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = { {0x001000003f000180, &upb_psv4_2bt}, {0x001400003f000188, &upb_psb1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001e00003f000298, &upb_psb1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001500003f0001a8, &upb_psb1_2bt}, {0x00a800003f0f01b2, &upb_prm_2bt_maxmaxb}, @@ -178,6 +188,9 @@ const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init &envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[0], &envoy_config_listener_v3_Listener_DeprecatedV1__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener.DeprecatedV1", +#endif }; static const upb_MiniTableSub envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = { @@ -194,6 +207,9 @@ const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConf &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[0], &envoy_config_listener_v3_Listener_ConnectionBalanceConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener.ConnectionBalanceConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -206,30 +222,45 @@ const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConf NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener.ConnectionBalanceConfig.ExactBalance", +#endif }; const upb_MiniTable envoy__config__listener__v3__Listener__InternalListenerConfig_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Listener.InternalListenerConfig", +#endif }; const upb_MiniTable envoy__config__listener__v3__ListenerManager_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerManager", +#endif }; const upb_MiniTable envoy__config__listener__v3__ValidationListenerManager_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ValidationListenerManager", +#endif }; const upb_MiniTable envoy__config__listener__v3__ApiListenerManager_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ApiListenerManager", +#endif }; static const upb_MiniTable *messages_layout[10] = { diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h index 10c78c793d..5c0bcc3e11 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb.h @@ -149,11 +149,11 @@ UPB_INLINE bool envoy_config_listener_v3_Filter_has_config_discovery(const envoy UPB_INLINE void envoy_config_listener_v3_Filter_set_name(envoy_config_listener_v3_Filter *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_Filter_set_typed_config(envoy_config_listener_v3_Filter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_Filter_mutable_typed_config(envoy_config_listener_v3_Filter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_Filter_typed_config(msg); @@ -165,7 +165,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_Filter_mutable_t } UPB_INLINE void envoy_config_listener_v3_Filter_set_config_discovery(envoy_config_listener_v3_Filter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -505,11 +505,11 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_listener_v3_Filte } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_address_suffix(envoy_config_listener_v3_FilterChainMatch *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_suffix_len(envoy_config_listener_v3_FilterChainMatch *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterChainMatch_mutable_suffix_len(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_FilterChainMatch_suffix_len(msg); @@ -579,7 +579,7 @@ UPB_INLINE bool envoy_config_listener_v3_FilterChainMatch_add_source_ports(envoy } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_destination_port(envoy_config_listener_v3_FilterChainMatch *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 64), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterChainMatch_mutable_destination_port(envoy_config_listener_v3_FilterChainMatch* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_FilterChainMatch_destination_port(msg); @@ -591,7 +591,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_FilterCh } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_transport_protocol(envoy_config_listener_v3_FilterChainMatch *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(56, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_listener_v3_FilterChainMatch_mutable_application_protocols(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { upb_MiniTableField field = {10, UPB_SIZE(32, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -651,7 +651,7 @@ UPB_INLINE bool envoy_config_listener_v3_FilterChainMatch_add_server_names(envoy } UPB_INLINE void envoy_config_listener_v3_FilterChainMatch_set_source_type(envoy_config_listener_v3_FilterChainMatch *msg, int32_t value) { const upb_MiniTableField field = {12, UPB_SIZE(40, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_config_listener_v3_FilterChainMatch_mutable_direct_source_prefix_ranges(envoy_config_listener_v3_FilterChainMatch* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(44, 104), 0, 4, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -863,7 +863,7 @@ UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_transport_socket_connec UPB_INLINE void envoy_config_listener_v3_FilterChain_set_filter_chain_match(envoy_config_listener_v3_FilterChain *msg, envoy_config_listener_v3_FilterChainMatch* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_FilterChainMatch* envoy_config_listener_v3_FilterChain_mutable_filter_chain_match(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct envoy_config_listener_v3_FilterChainMatch* sub = (struct envoy_config_listener_v3_FilterChainMatch*)envoy_config_listener_v3_FilterChain_filter_chain_match(msg); @@ -905,7 +905,7 @@ UPB_INLINE struct envoy_config_listener_v3_Filter* envoy_config_listener_v3_Filt } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_use_proxy_proto(envoy_config_listener_v3_FilterChain *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_FilterChain_mutable_use_proxy_proto(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_FilterChain_use_proxy_proto(msg); @@ -917,7 +917,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_FilterChai } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_metadata(envoy_config_listener_v3_FilterChain *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_FilterChain_mutable_metadata(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_listener_v3_FilterChain_metadata(msg); @@ -929,7 +929,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Filter } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_transport_socket(envoy_config_listener_v3_FilterChain *msg, struct envoy_config_core_v3_TransportSocket* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_listener_v3_FilterChain_mutable_transport_socket(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_config_listener_v3_FilterChain_transport_socket(msg); @@ -941,11 +941,11 @@ UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_name(envoy_config_listener_v3_FilterChain *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_on_demand_configuration(envoy_config_listener_v3_FilterChain *msg, envoy_config_listener_v3_FilterChain_OnDemandConfiguration* value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 72), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* envoy_config_listener_v3_FilterChain_mutable_on_demand_configuration(envoy_config_listener_v3_FilterChain* msg, upb_Arena* arena) { struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* sub = (struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration*)envoy_config_listener_v3_FilterChain_on_demand_configuration(msg); @@ -957,7 +957,7 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* en } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_transport_socket_connect_timeout(envoy_config_listener_v3_FilterChain *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 80), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1023,7 +1023,7 @@ UPB_INLINE bool envoy_config_listener_v3_FilterChain_OnDemandConfiguration_has_r UPB_INLINE void envoy_config_listener_v3_FilterChain_OnDemandConfiguration_set_rebuild_timeout(envoy_config_listener_v3_FilterChain_OnDemandConfiguration *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain_OnDemandConfiguration_mutable_rebuild_timeout(envoy_config_listener_v3_FilterChain_OnDemandConfiguration* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_FilterChain_OnDemandConfiguration_rebuild_timeout(msg); @@ -1166,7 +1166,7 @@ UPB_INLINE bool envoy_config_listener_v3_ListenerFilterChainMatchPredicate_has_d UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_or_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_or_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_or_match(msg); @@ -1178,7 +1178,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_Mat } UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_and_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_and_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_and_match(msg); @@ -1190,7 +1190,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate_Mat } UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_not_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, envoy_config_listener_v3_ListenerFilterChainMatchPredicate* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_not_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_not_match(msg); @@ -1202,11 +1202,11 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* en } UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_any_match(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_ListenerFilterChainMatchPredicate_set_destination_port_range(envoy_config_listener_v3_ListenerFilterChainMatchPredicate *msg, struct envoy_type_v3_Int32Range* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_listener_v3_ListenerFilterChainMatchPredicate_mutable_destination_port_range(envoy_config_listener_v3_ListenerFilterChainMatchPredicate* msg, upb_Arena* arena) { struct envoy_type_v3_Int32Range* sub = (struct envoy_type_v3_Int32Range*)envoy_config_listener_v3_ListenerFilterChainMatchPredicate_destination_port_range(msg); @@ -1426,11 +1426,11 @@ UPB_INLINE bool envoy_config_listener_v3_ListenerFilter_has_config_discovery(con UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_name(envoy_config_listener_v3_ListenerFilter *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_typed_config(envoy_config_listener_v3_ListenerFilter *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ListenerFilter_mutable_typed_config(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_listener_v3_ListenerFilter_typed_config(msg); @@ -1442,7 +1442,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ListenerFilter_m } UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_filter_disabled(envoy_config_listener_v3_ListenerFilter *msg, envoy_config_listener_v3_ListenerFilterChainMatchPredicate* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* envoy_config_listener_v3_ListenerFilter_mutable_filter_disabled(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) { struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* sub = (struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate*)envoy_config_listener_v3_ListenerFilter_filter_disabled(msg); @@ -1454,7 +1454,7 @@ UPB_INLINE struct envoy_config_listener_v3_ListenerFilterChainMatchPredicate* en } UPB_INLINE void envoy_config_listener_v3_ListenerFilter_set_config_discovery(envoy_config_listener_v3_ListenerFilter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 40), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_listener_v3_ListenerFilter_mutable_config_discovery(envoy_config_listener_v3_ListenerFilter* msg, upb_Arena* arena) { struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_config_listener_v3_ListenerFilter_config_discovery(msg); diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c index 2c8c505c98..238cddc7d7 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.c @@ -38,6 +38,9 @@ const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = { &envoy_config_listener_v3_Filter_submsgs[0], &envoy_config_listener_v3_Filter__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.Filter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -76,6 +79,9 @@ const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = { &envoy_config_listener_v3_FilterChainMatch_submsgs[0], &envoy_config_listener_v3_FilterChainMatch__fields[0], UPB_SIZE(64, 112), 11, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.FilterChainMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -121,6 +127,9 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = { &envoy_config_listener_v3_FilterChain_submsgs[0], &envoy_config_listener_v3_FilterChain__fields[0], UPB_SIZE(48, 88), 8, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.FilterChain", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -145,6 +154,9 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfigurat &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[0], &envoy_config_listener_v3_FilterChain_OnDemandConfiguration__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.FilterChain.OnDemandConfiguration", +#endif }; static const upb_MiniTableSub envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = { @@ -166,6 +178,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[0], &envoy_config_listener_v3_ListenerFilterChainMatchPredicate__fields[0], UPB_SIZE(16, 24), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerFilterChainMatchPredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -190,6 +205,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[0], &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerFilterChainMatchPredicate.MatchSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -213,6 +231,9 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init = { &envoy_config_listener_v3_ListenerFilter_submsgs[0], &envoy_config_listener_v3_ListenerFilter__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ListenerFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h index b5e46b8e87..b2000cbe94 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb.h @@ -33,6 +33,7 @@ typedef struct envoy_config_listener_v3_QuicProtocolOptions { upb_Message UPB_PR struct envoy_config_core_v3_QuicProtocolOptions; struct envoy_config_core_v3_RuntimeFeatureFlag; struct envoy_config_core_v3_TypedExtensionConfig; +struct google_protobuf_BoolValue; struct google_protobuf_Duration; struct google_protobuf_UInt32Value; @@ -218,10 +219,42 @@ UPB_INLINE bool envoy_config_listener_v3_QuicProtocolOptions_has_server_preferre const upb_MiniTableField field = {9, UPB_SIZE(44, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_clear_send_disable_active_migration(envoy_config_listener_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_QuicProtocolOptions_send_disable_active_migration(const envoy_config_listener_v3_QuicProtocolOptions* msg) { + const struct google_protobuf_BoolValue* default_val = NULL; + const struct google_protobuf_BoolValue* ret; + const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_listener_v3_QuicProtocolOptions_has_send_disable_active_migration(const envoy_config_listener_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_clear_connection_debug_visitor_config(envoy_config_listener_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_connection_debug_visitor_config(const envoy_config_listener_v3_QuicProtocolOptions* msg) { + const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; + const struct envoy_config_core_v3_TypedExtensionConfig* ret; + const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_listener_v3_QuicProtocolOptions_has_connection_debug_visitor_config(const envoy_config_listener_v3_QuicProtocolOptions* msg) { + const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_quic_protocol_options(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_QuicProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_listener_v3_QuicProtocolOptions_mutable_quic_protocol_options(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_QuicProtocolOptions* sub = (struct envoy_config_core_v3_QuicProtocolOptions*)envoy_config_listener_v3_QuicProtocolOptions_quic_protocol_options(msg); @@ -233,7 +266,7 @@ UPB_INLINE struct envoy_config_core_v3_QuicProtocolOptions* envoy_config_listene } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_idle_timeout(envoy_config_listener_v3_QuicProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtocolOptions_mutable_idle_timeout(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_QuicProtocolOptions_idle_timeout(msg); @@ -245,7 +278,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtoco } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_crypto_handshake_timeout(envoy_config_listener_v3_QuicProtocolOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtocolOptions_mutable_crypto_handshake_timeout(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_QuicProtocolOptions_crypto_handshake_timeout(msg); @@ -257,7 +290,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_QuicProtoco } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_enabled(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_RuntimeFeatureFlag* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_listener_v3_QuicProtocolOptions_mutable_enabled(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFeatureFlag* sub = (struct envoy_config_core_v3_RuntimeFeatureFlag*)envoy_config_listener_v3_QuicProtocolOptions_enabled(msg); @@ -269,7 +302,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFeatureFlag* envoy_config_listener } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_packets_to_read_to_connection_count_ratio(envoy_config_listener_v3_QuicProtocolOptions *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_QuicProtocolOptions_mutable_packets_to_read_to_connection_count_ratio(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_QuicProtocolOptions_packets_to_read_to_connection_count_ratio(msg); @@ -281,7 +314,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_QuicProt } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_crypto_stream_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_crypto_stream_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_crypto_stream_config(msg); @@ -293,7 +326,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_proof_source_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_proof_source_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_proof_source_config(msg); @@ -305,7 +338,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_connection_id_generator_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 72), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_connection_id_generator_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_connection_id_generator_config(msg); @@ -317,7 +350,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_server_preferred_address_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {9, UPB_SIZE(44, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_server_preferred_address_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_server_preferred_address_config(msg); @@ -327,6 +360,30 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen } return sub; } +UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_send_disable_active_migration(envoy_config_listener_v3_QuicProtocolOptions *msg, struct google_protobuf_BoolValue* value) { + const upb_MiniTableField field = {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_QuicProtocolOptions_mutable_send_disable_active_migration(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_QuicProtocolOptions_send_disable_active_migration(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena); + if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_send_disable_active_migration(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_listener_v3_QuicProtocolOptions_set_connection_debug_visitor_config(envoy_config_listener_v3_QuicProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { + const upb_MiniTableField field = {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_QuicProtocolOptions_mutable_connection_debug_visitor_config(envoy_config_listener_v3_QuicProtocolOptions* msg, upb_Arena* arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_QuicProtocolOptions_connection_debug_visitor_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena); + if (sub) envoy_config_listener_v3_QuicProtocolOptions_set_connection_debug_visitor_config(msg, sub); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c index 72796ed446..e98406c2fb 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.c @@ -21,7 +21,7 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_config_listener_v3_QuicProtocolOptions_submsgs[9] = { +static const upb_MiniTableSub envoy_config_listener_v3_QuicProtocolOptions_submsgs[11] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, @@ -31,9 +31,11 @@ static const upb_MiniTableSub envoy_config_listener_v3_QuicProtocolOptions_subms {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fields[9] = { +static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fields[11] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -43,12 +45,17 @@ static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fi {7, UPB_SIZE(36, 64), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {8, UPB_SIZE(40, 72), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {9, UPB_SIZE(44, 80), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {10, UPB_SIZE(48, 88), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {11, UPB_SIZE(52, 96), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__listener__v3__QuicProtocolOptions_msg_init = { &envoy_config_listener_v3_QuicProtocolOptions_submsgs[0], &envoy_config_listener_v3_QuicProtocolOptions__fields[0], - UPB_SIZE(48, 88), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(255), 0, + UPB_SIZE(56, 104), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.QuicProtocolOptions", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h index 2cd8e99510..c8193d5c0c 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb.h @@ -120,7 +120,7 @@ UPB_INLINE bool envoy_config_listener_v3_UdpListenerConfig_has_udp_packet_packet UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_downstream_socket_config(envoy_config_listener_v3_UdpListenerConfig *msg, struct envoy_config_core_v3_UdpSocketConfig* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_UdpSocketConfig* envoy_config_listener_v3_UdpListenerConfig_mutable_downstream_socket_config(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_UdpSocketConfig* sub = (struct envoy_config_core_v3_UdpSocketConfig*)envoy_config_listener_v3_UdpListenerConfig_downstream_socket_config(msg); @@ -132,7 +132,7 @@ UPB_INLINE struct envoy_config_core_v3_UdpSocketConfig* envoy_config_listener_v3 } UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_quic_options(envoy_config_listener_v3_UdpListenerConfig *msg, struct envoy_config_listener_v3_QuicProtocolOptions* value) { const upb_MiniTableField field = {7, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_listener_v3_QuicProtocolOptions* envoy_config_listener_v3_UdpListenerConfig_mutable_quic_options(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) { struct envoy_config_listener_v3_QuicProtocolOptions* sub = (struct envoy_config_listener_v3_QuicProtocolOptions*)envoy_config_listener_v3_UdpListenerConfig_quic_options(msg); @@ -144,7 +144,7 @@ UPB_INLINE struct envoy_config_listener_v3_QuicProtocolOptions* envoy_config_lis } UPB_INLINE void envoy_config_listener_v3_UdpListenerConfig_set_udp_packet_packet_writer_config(envoy_config_listener_v3_UdpListenerConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_UdpListenerConfig_mutable_udp_packet_packet_writer_config(envoy_config_listener_v3_UdpListenerConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_UdpListenerConfig_udp_packet_packet_writer_config(msg); diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c index 8552f7b5d8..8bb9a2bd1a 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.c @@ -33,12 +33,18 @@ const upb_MiniTable envoy__config__listener__v3__UdpListenerConfig_msg_init = { &envoy_config_listener_v3_UdpListenerConfig_submsgs[0], &envoy_config_listener_v3_UdpListenerConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.UdpListenerConfig", +#endif }; const upb_MiniTable envoy__config__listener__v3__ActiveRawUdpListenerConfig_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.listener.v3.ActiveRawUdpListenerConfig", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h index c5e1a21014..748a211d58 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb.h @@ -145,7 +145,7 @@ UPB_INLINE int32_t envoy_config_metrics_v3_MetricsServiceConfig_histogram_emit_m UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_grpc_service(envoy_config_metrics_v3_MetricsServiceConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_metrics_v3_MetricsServiceConfig_mutable_grpc_service(envoy_config_metrics_v3_MetricsServiceConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_metrics_v3_MetricsServiceConfig_grpc_service(msg); @@ -157,7 +157,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_metrics_v3_Metr } UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_report_counters_as_deltas(envoy_config_metrics_v3_MetricsServiceConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_MetricsServiceConfig_mutable_report_counters_as_deltas(envoy_config_metrics_v3_MetricsServiceConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_metrics_v3_MetricsServiceConfig_report_counters_as_deltas(msg); @@ -169,15 +169,15 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_MetricsServ } UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_transport_api_version(envoy_config_metrics_v3_MetricsServiceConfig *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_emit_tags_as_labels(envoy_config_metrics_v3_MetricsServiceConfig *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_histogram_emit_mode(envoy_config_metrics_v3_MetricsServiceConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c index 73b43ea678..be12b7b551 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.c @@ -35,6 +35,9 @@ const upb_MiniTable envoy__config__metrics__v3__MetricsServiceConfig_msg_init = &envoy_config_metrics_v3_MetricsServiceConfig_submsgs[0], &envoy_config_metrics_v3_MetricsServiceConfig__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.MetricsServiceConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h index f6a32627e9..6dd6e11085 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb.h @@ -120,11 +120,11 @@ UPB_INLINE bool envoy_config_metrics_v3_StatsSink_has_typed_config(const envoy_c UPB_INLINE void envoy_config_metrics_v3_StatsSink_set_name(envoy_config_metrics_v3_StatsSink *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_StatsSink_set_typed_config(envoy_config_metrics_v3_StatsSink *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -300,7 +300,7 @@ UPB_INLINE struct envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_ } UPB_INLINE void envoy_config_metrics_v3_StatsConfig_set_use_all_default_tags(envoy_config_metrics_v3_StatsConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -312,7 +312,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_StatsConfig } UPB_INLINE void envoy_config_metrics_v3_StatsConfig_set_stats_matcher(envoy_config_metrics_v3_StatsConfig *msg, envoy_config_metrics_v3_StatsMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -451,11 +451,11 @@ UPB_INLINE bool envoy_config_metrics_v3_StatsMatcher_has_inclusion_list(const en UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_reject_all(envoy_config_metrics_v3_StatsMatcher *msg, bool value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_exclusion_list(envoy_config_metrics_v3_StatsMatcher *msg, struct envoy_type_matcher_v3_ListStringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -467,7 +467,7 @@ UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_ } UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_inclusion_list(envoy_config_metrics_v3_StatsMatcher *msg, struct envoy_type_matcher_v3_ListStringMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -571,15 +571,15 @@ UPB_INLINE bool envoy_config_metrics_v3_TagSpecifier_has_fixed_value(const envoy UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_tag_name(envoy_config_metrics_v3_TagSpecifier *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_regex(envoy_config_metrics_v3_TagSpecifier *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_fixed_value(envoy_config_metrics_v3_TagSpecifier *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.metrics.v3.HistogramBucketSettings */ @@ -669,7 +669,7 @@ UPB_INLINE upb_Array* _envoy_config_metrics_v3_HistogramBucketSettings_buckets_m UPB_INLINE void envoy_config_metrics_v3_HistogramBucketSettings_set_match(envoy_config_metrics_v3_HistogramBucketSettings *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -801,7 +801,7 @@ UPB_INLINE upb_StringView envoy_config_metrics_v3_StatsdSink_prefix(const envoy_ UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_address(envoy_config_metrics_v3_StatsdSink *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -813,11 +813,11 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_StatsdSi } UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_tcp_cluster_name(envoy_config_metrics_v3_StatsdSink *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_prefix(envoy_config_metrics_v3_StatsdSink *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.metrics.v3.DogStatsdSink */ @@ -912,7 +912,7 @@ UPB_INLINE bool envoy_config_metrics_v3_DogStatsdSink_has_max_bytes_per_datagram UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_address(envoy_config_metrics_v3_DogStatsdSink *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 40), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -924,11 +924,11 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_DogStats } UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_prefix(envoy_config_metrics_v3_DogStatsdSink *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {4, UPB_SIZE(16, 32), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -990,7 +990,7 @@ UPB_INLINE int64_t envoy_config_metrics_v3_HystrixSink_num_buckets(const envoy_c UPB_INLINE void envoy_config_metrics_v3_HystrixSink_set_num_buckets(envoy_config_metrics_v3_HystrixSink *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c index 9927e3ea13..fe1d316c05 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = { &envoy_config_metrics_v3_StatsSink_submsgs[0], &envoy_config_metrics_v3_StatsSink__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.StatsSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -58,6 +61,9 @@ const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = { &envoy_config_metrics_v3_StatsConfig_submsgs[0], &envoy_config_metrics_v3_StatsConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.StatsConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -85,6 +91,9 @@ const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init = { &envoy_config_metrics_v3_StatsMatcher_submsgs[0], &envoy_config_metrics_v3_StatsMatcher__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.StatsMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pob1_1bt}, @@ -103,6 +112,9 @@ const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init = { NULL, &envoy_config_metrics_v3_TagSpecifier__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.TagSpecifier", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -124,6 +136,9 @@ const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0], &envoy_config_metrics_v3_HistogramBucketSettings__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.HistogramBucketSettings", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -146,6 +161,9 @@ const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = { &envoy_config_metrics_v3_StatsdSink_submsgs[0], &envoy_config_metrics_v3_StatsdSink__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.StatsdSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -169,6 +187,9 @@ const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init = { &envoy_config_metrics_v3_DogStatsdSink_submsgs[0], &envoy_config_metrics_v3_DogStatsdSink__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.DogStatsdSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0028000c0100000a, &upb_pom_1bt_maxmaxb}, @@ -185,6 +206,9 @@ const upb_MiniTable envoy__config__metrics__v3__HystrixSink_msg_init = { NULL, &envoy_config_metrics_v3_HystrixSink__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.metrics.v3.HystrixSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h index 35173b99fb..d4e55ed495 100644 --- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h +++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb.h @@ -125,11 +125,11 @@ UPB_INLINE bool envoy_config_overload_v3_ResourceMonitor_has_typed_config(const UPB_INLINE void envoy_config_overload_v3_ResourceMonitor_set_name(envoy_config_overload_v3_ResourceMonitor *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_overload_v3_ResourceMonitor_set_typed_config(envoy_config_overload_v3_ResourceMonitor *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -191,7 +191,7 @@ UPB_INLINE double envoy_config_overload_v3_ThresholdTrigger_value(const envoy_co UPB_INLINE void envoy_config_overload_v3_ThresholdTrigger_set_value(envoy_config_overload_v3_ThresholdTrigger *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.overload.v3.ScaledTrigger */ @@ -257,11 +257,11 @@ UPB_INLINE double envoy_config_overload_v3_ScaledTrigger_saturation_threshold(co UPB_INLINE void envoy_config_overload_v3_ScaledTrigger_set_scaling_threshold(envoy_config_overload_v3_ScaledTrigger *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_overload_v3_ScaledTrigger_set_saturation_threshold(envoy_config_overload_v3_ScaledTrigger *msg, double value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.overload.v3.Trigger */ @@ -357,11 +357,11 @@ UPB_INLINE bool envoy_config_overload_v3_Trigger_has_scaled(const envoy_config_o UPB_INLINE void envoy_config_overload_v3_Trigger_set_name(envoy_config_overload_v3_Trigger *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_overload_v3_Trigger_set_threshold(envoy_config_overload_v3_Trigger *msg, envoy_config_overload_v3_ThresholdTrigger* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -373,7 +373,7 @@ UPB_INLINE struct envoy_config_overload_v3_ThresholdTrigger* envoy_config_overlo } UPB_INLINE void envoy_config_overload_v3_Trigger_set_scaled(envoy_config_overload_v3_Trigger *msg, envoy_config_overload_v3_ScaledTrigger* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -577,11 +577,11 @@ UPB_INLINE bool envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTi UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_timer(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {2, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -593,7 +593,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_ScaleTimers } 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) { const upb_MiniTableField field = {3, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -703,7 +703,7 @@ UPB_INLINE bool envoy_config_overload_v3_OverloadAction_has_typed_config(const e UPB_INLINE void envoy_config_overload_v3_OverloadAction_set_name(envoy_config_overload_v3_OverloadAction *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_overload_v3_Trigger** envoy_config_overload_v3_OverloadAction_mutable_triggers(envoy_config_overload_v3_OverloadAction* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -737,7 +737,7 @@ UPB_INLINE struct envoy_config_overload_v3_Trigger* envoy_config_overload_v3_Ove } UPB_INLINE void envoy_config_overload_v3_OverloadAction_set_typed_config(envoy_config_overload_v3_OverloadAction *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -831,7 +831,7 @@ UPB_INLINE upb_Array* _envoy_config_overload_v3_LoadShedPoint_triggers_mutable_u UPB_INLINE void envoy_config_overload_v3_LoadShedPoint_set_name(envoy_config_overload_v3_LoadShedPoint *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_overload_v3_Trigger** envoy_config_overload_v3_LoadShedPoint_mutable_triggers(envoy_config_overload_v3_LoadShedPoint* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -915,7 +915,7 @@ UPB_INLINE uint32_t envoy_config_overload_v3_BufferFactoryConfig_minimum_account UPB_INLINE void envoy_config_overload_v3_BufferFactoryConfig_set_minimum_account_to_track_power_of_two(envoy_config_overload_v3_BufferFactoryConfig *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.overload.v3.OverloadManager */ @@ -1085,7 +1085,7 @@ UPB_INLINE upb_Array* _envoy_config_overload_v3_OverloadManager_loadshed_points_ UPB_INLINE void envoy_config_overload_v3_OverloadManager_set_refresh_interval(envoy_config_overload_v3_OverloadManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1157,7 +1157,7 @@ UPB_INLINE struct envoy_config_overload_v3_OverloadAction* envoy_config_overload } UPB_INLINE void envoy_config_overload_v3_OverloadManager_set_buffer_factory_config(envoy_config_overload_v3_OverloadManager *msg, envoy_config_overload_v3_BufferFactoryConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_overload_v3_BufferFactoryConfig* envoy_config_overload_v3_OverloadManager_mutable_buffer_factory_config(envoy_config_overload_v3_OverloadManager* msg, upb_Arena* arena) { struct envoy_config_overload_v3_BufferFactoryConfig* sub = (struct envoy_config_overload_v3_BufferFactoryConfig*)envoy_config_overload_v3_OverloadManager_buffer_factory_config(msg); diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c index 5edc477fc7..691509aeb5 100644 --- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable envoy__config__overload__v3__ResourceMonitor_msg_init = { &envoy_config_overload_v3_ResourceMonitor_submsgs[0], &envoy_config_overload_v3_ResourceMonitor__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ResourceMonitor", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -47,6 +50,9 @@ const upb_MiniTable envoy__config__overload__v3__ThresholdTrigger_msg_init = { NULL, &envoy_config_overload_v3_ThresholdTrigger__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ThresholdTrigger", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -62,6 +68,9 @@ const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init = { NULL, &envoy_config_overload_v3_ScaledTrigger__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ScaledTrigger", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -85,6 +94,9 @@ const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = { &envoy_config_overload_v3_Trigger_submsgs[0], &envoy_config_overload_v3_Trigger__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.Trigger", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -105,6 +117,9 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0], &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ScaleTimersOverloadActionConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -126,6 +141,9 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0], &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[0], 24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.ScaleTimersOverloadActionConfig.ScaleTimer", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -149,6 +167,9 @@ const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = { &envoy_config_overload_v3_OverloadAction_submsgs[0], &envoy_config_overload_v3_OverloadAction__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.OverloadAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -170,6 +191,9 @@ const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init = { &envoy_config_overload_v3_LoadShedPoint_submsgs[0], &envoy_config_overload_v3_LoadShedPoint__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.LoadShedPoint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -186,6 +210,9 @@ const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init = NULL, &envoy_config_overload_v3_BufferFactoryConfig__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.BufferFactoryConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -212,6 +239,9 @@ const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init = { &envoy_config_overload_v3_OverloadManager_submsgs[0], &envoy_config_overload_v3_OverloadManager__fields[0], UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.overload.v3.OverloadManager", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h index a51feef3eb..26fa4e55e3 100644 --- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h +++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb.h @@ -168,7 +168,7 @@ UPB_INLINE bool envoy_config_rbac_v3_RBAC_has_audit_logging_options(const envoy_ UPB_INLINE void envoy_config_rbac_v3_RBAC_set_action(envoy_config_rbac_v3_RBAC *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_RBAC_policies_clear(envoy_config_rbac_v3_RBAC* msg) { const upb_MiniTableField field = {2, 16, 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -197,7 +197,7 @@ UPB_INLINE envoy_config_rbac_v3_RBAC_PoliciesEntry* envoy_config_rbac_v3_RBAC_po } UPB_INLINE void envoy_config_rbac_v3_RBAC_set_audit_logging_options(envoy_config_rbac_v3_RBAC *msg, envoy_config_rbac_v3_RBAC_AuditLoggingOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions* envoy_config_rbac_v3_RBAC_mutable_audit_logging_options(envoy_config_rbac_v3_RBAC* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions* sub = (struct envoy_config_rbac_v3_RBAC_AuditLoggingOptions*)envoy_config_rbac_v3_RBAC_audit_logging_options(msg); @@ -291,7 +291,7 @@ UPB_INLINE upb_Array* _envoy_config_rbac_v3_RBAC_AuditLoggingOptions_logger_conf UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_set_audit_condition(envoy_config_rbac_v3_RBAC_AuditLoggingOptions *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig** envoy_config_rbac_v3_RBAC_AuditLoggingOptions_mutable_logger_configs(envoy_config_rbac_v3_RBAC_AuditLoggingOptions* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -391,7 +391,7 @@ UPB_INLINE bool envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_ UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_mutable_audit_logger(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_audit_logger(msg); @@ -403,7 +403,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v } UPB_INLINE void envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_set_is_optional(envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.rbac.v3.RBAC.PoliciesEntry */ @@ -622,7 +622,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Policy_ad } UPB_INLINE void envoy_config_rbac_v3_Policy_set_condition(envoy_config_rbac_v3_Policy *msg, struct google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Policy_mutable_condition(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)envoy_config_rbac_v3_Policy_condition(msg); @@ -634,7 +634,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* envoy_config_rbac_v3_Policy_mut } UPB_INLINE void envoy_config_rbac_v3_Policy_set_checked_condition(envoy_config_rbac_v3_Policy *msg, struct google_api_expr_v1alpha1_CheckedExpr* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_CheckedExpr* envoy_config_rbac_v3_Policy_mutable_checked_condition(envoy_config_rbac_v3_Policy* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_CheckedExpr* sub = (struct google_api_expr_v1alpha1_CheckedExpr*)envoy_config_rbac_v3_Policy_checked_condition(msg); @@ -694,6 +694,7 @@ typedef enum { envoy_config_rbac_v3_Permission_rule_not_rule = 8, envoy_config_rbac_v3_Permission_rule_requested_server_name = 9, envoy_config_rbac_v3_Permission_rule_matcher = 12, + envoy_config_rbac_v3_Permission_rule_uri_template = 13, envoy_config_rbac_v3_Permission_rule_NOT_SET = 0 } envoy_config_rbac_v3_Permission_rule_oneofcases; UPB_INLINE envoy_config_rbac_v3_Permission_rule_oneofcases envoy_config_rbac_v3_Permission_rule_case(const envoy_config_rbac_v3_Permission* msg) { @@ -893,10 +894,26 @@ UPB_INLINE bool envoy_config_rbac_v3_Permission_has_matcher(const envoy_config_r const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_rbac_v3_Permission_clear_uri_template(envoy_config_rbac_v3_Permission* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_uri_template(const envoy_config_rbac_v3_Permission* msg) { + const struct envoy_config_core_v3_TypedExtensionConfig* default_val = NULL; + const struct envoy_config_core_v3_TypedExtensionConfig* ret; + const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_rbac_v3_Permission_has_uri_template(const envoy_config_rbac_v3_Permission* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_rbac_v3_Permission_set_and_rules(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission_Set* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_mutable_and_rules(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Permission_Set* sub = (struct envoy_config_rbac_v3_Permission_Set*)envoy_config_rbac_v3_Permission_and_rules(msg); @@ -908,7 +925,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Perm } UPB_INLINE void envoy_config_rbac_v3_Permission_set_or_rules(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission_Set* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Permission_mutable_or_rules(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Permission_Set* sub = (struct envoy_config_rbac_v3_Permission_Set*)envoy_config_rbac_v3_Permission_or_rules(msg); @@ -920,11 +937,11 @@ UPB_INLINE struct envoy_config_rbac_v3_Permission_Set* envoy_config_rbac_v3_Perm } UPB_INLINE void envoy_config_rbac_v3_Permission_set_any(envoy_config_rbac_v3_Permission *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_Permission_set_header(envoy_config_rbac_v3_Permission *msg, struct envoy_config_route_v3_HeaderMatcher* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Permission_mutable_header(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_rbac_v3_Permission_header(msg); @@ -936,7 +953,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Perm } UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_ip(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_CidrRange* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Permission_mutable_destination_ip(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Permission_destination_ip(msg); @@ -948,11 +965,11 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Permissio } UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port(envoy_config_rbac_v3_Permission *msg, uint32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_Permission_set_metadata(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Permission_mutable_metadata(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_rbac_v3_Permission_metadata(msg); @@ -964,7 +981,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Pe } UPB_INLINE void envoy_config_rbac_v3_Permission_set_not_rule(envoy_config_rbac_v3_Permission *msg, envoy_config_rbac_v3_Permission* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permission_mutable_not_rule(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Permission* sub = (struct envoy_config_rbac_v3_Permission*)envoy_config_rbac_v3_Permission_not_rule(msg); @@ -976,7 +993,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Permission* envoy_config_rbac_v3_Permissi } UPB_INLINE void envoy_config_rbac_v3_Permission_set_requested_server_name(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Permission_mutable_requested_server_name(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_rbac_v3_Permission_requested_server_name(msg); @@ -988,7 +1005,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Perm } UPB_INLINE void envoy_config_rbac_v3_Permission_set_url_path(envoy_config_rbac_v3_Permission *msg, struct envoy_type_matcher_v3_PathMatcher* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Permission_mutable_url_path(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_PathMatcher* sub = (struct envoy_type_matcher_v3_PathMatcher*)envoy_config_rbac_v3_Permission_url_path(msg); @@ -1000,7 +1017,7 @@ UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Permis } UPB_INLINE void envoy_config_rbac_v3_Permission_set_destination_port_range(envoy_config_rbac_v3_Permission *msg, struct envoy_type_v3_Int32Range* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permission_mutable_destination_port_range(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_type_v3_Int32Range* sub = (struct envoy_type_v3_Int32Range*)envoy_config_rbac_v3_Permission_destination_port_range(msg); @@ -1012,7 +1029,7 @@ UPB_INLINE struct envoy_type_v3_Int32Range* envoy_config_rbac_v3_Permission_muta } UPB_INLINE void envoy_config_rbac_v3_Permission_set_matcher(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_mutable_matcher(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_Permission_matcher(msg); @@ -1022,6 +1039,18 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v } return sub; } +UPB_INLINE void envoy_config_rbac_v3_Permission_set_uri_template(envoy_config_rbac_v3_Permission *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { + const upb_MiniTableField field = {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_rbac_v3_Permission_mutable_uri_template(envoy_config_rbac_v3_Permission* msg, upb_Arena* arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_rbac_v3_Permission_uri_template(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_Message_New(&envoy__config__core__v3__TypedExtensionConfig_msg_init, arena); + if (sub) envoy_config_rbac_v3_Permission_set_uri_template(msg, sub); + } + return sub; +} /* envoy.config.rbac.v3.Permission.Set */ @@ -1374,7 +1403,7 @@ UPB_INLINE bool envoy_config_rbac_v3_Principal_has_filter_state(const envoy_conf UPB_INLINE void envoy_config_rbac_v3_Principal_set_and_ids(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Set* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_mutable_and_ids(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Principal_Set* sub = (struct envoy_config_rbac_v3_Principal_Set*)envoy_config_rbac_v3_Principal_and_ids(msg); @@ -1386,7 +1415,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Princ } UPB_INLINE void envoy_config_rbac_v3_Principal_set_or_ids(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Set* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Principal_mutable_or_ids(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Principal_Set* sub = (struct envoy_config_rbac_v3_Principal_Set*)envoy_config_rbac_v3_Principal_or_ids(msg); @@ -1398,11 +1427,11 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal_Set* envoy_config_rbac_v3_Princ } UPB_INLINE void envoy_config_rbac_v3_Principal_set_any(envoy_config_rbac_v3_Principal *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_Principal_set_authenticated(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal_Authenticated* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rbac_v3_Principal_mutable_authenticated(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Principal_Authenticated* sub = (struct envoy_config_rbac_v3_Principal_Authenticated*)envoy_config_rbac_v3_Principal_authenticated(msg); @@ -1414,7 +1443,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal_Authenticated* envoy_config_rba } UPB_INLINE void envoy_config_rbac_v3_Principal_set_source_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_source_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_source_ip(msg); @@ -1426,7 +1455,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal } UPB_INLINE void envoy_config_rbac_v3_Principal_set_header(envoy_config_rbac_v3_Principal *msg, struct envoy_config_route_v3_HeaderMatcher* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Principal_mutable_header(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)envoy_config_rbac_v3_Principal_header(msg); @@ -1438,7 +1467,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_rbac_v3_Prin } UPB_INLINE void envoy_config_rbac_v3_Principal_set_metadata(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_MetadataMatcher* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Principal_mutable_metadata(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_MetadataMatcher* sub = (struct envoy_type_matcher_v3_MetadataMatcher*)envoy_config_rbac_v3_Principal_metadata(msg); @@ -1450,7 +1479,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_rbac_v3_Pr } UPB_INLINE void envoy_config_rbac_v3_Principal_set_not_id(envoy_config_rbac_v3_Principal *msg, envoy_config_rbac_v3_Principal* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal_mutable_not_id(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_Principal* sub = (struct envoy_config_rbac_v3_Principal*)envoy_config_rbac_v3_Principal_not_id(msg); @@ -1462,7 +1491,7 @@ UPB_INLINE struct envoy_config_rbac_v3_Principal* envoy_config_rbac_v3_Principal } UPB_INLINE void envoy_config_rbac_v3_Principal_set_url_path(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_PathMatcher* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Principal_mutable_url_path(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_PathMatcher* sub = (struct envoy_type_matcher_v3_PathMatcher*)envoy_config_rbac_v3_Principal_url_path(msg); @@ -1474,7 +1503,7 @@ UPB_INLINE struct envoy_type_matcher_v3_PathMatcher* envoy_config_rbac_v3_Princi } UPB_INLINE void envoy_config_rbac_v3_Principal_set_direct_remote_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_direct_remote_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_direct_remote_ip(msg); @@ -1486,7 +1515,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal } UPB_INLINE void envoy_config_rbac_v3_Principal_set_remote_ip(envoy_config_rbac_v3_Principal *msg, struct envoy_config_core_v3_CidrRange* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal_mutable_remote_ip(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_config_core_v3_CidrRange* sub = (struct envoy_config_core_v3_CidrRange*)envoy_config_rbac_v3_Principal_remote_ip(msg); @@ -1498,7 +1527,7 @@ UPB_INLINE struct envoy_config_core_v3_CidrRange* envoy_config_rbac_v3_Principal } UPB_INLINE void envoy_config_rbac_v3_Principal_set_filter_state(envoy_config_rbac_v3_Principal *msg, struct envoy_type_matcher_v3_FilterStateMatcher* value) { const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_FilterStateMatcher* envoy_config_rbac_v3_Principal_mutable_filter_state(envoy_config_rbac_v3_Principal* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_FilterStateMatcher* sub = (struct envoy_type_matcher_v3_FilterStateMatcher*)envoy_config_rbac_v3_Principal_filter_state(msg); @@ -1664,7 +1693,7 @@ UPB_INLINE bool envoy_config_rbac_v3_Principal_Authenticated_has_principal_name( UPB_INLINE void envoy_config_rbac_v3_Principal_Authenticated_set_principal_name(envoy_config_rbac_v3_Principal_Authenticated *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_rbac_v3_Principal_Authenticated_mutable_principal_name(envoy_config_rbac_v3_Principal_Authenticated* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_rbac_v3_Principal_Authenticated_principal_name(msg); @@ -1738,11 +1767,11 @@ UPB_INLINE int32_t envoy_config_rbac_v3_Action_action(const envoy_config_rbac_v3 UPB_INLINE void envoy_config_rbac_v3_Action_set_name(envoy_config_rbac_v3_Action *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_rbac_v3_Action_set_action(envoy_config_rbac_v3_Action *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c index 0f31ce98e0..a4684678b0 100644 --- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.c @@ -42,6 +42,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = { &envoy_config_rbac_v3_RBAC_submsgs[0], &envoy_config_rbac_v3_RBAC__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.RBAC", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -61,6 +64,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[0], &envoy_config_rbac_v3_RBAC_AuditLoggingOptions__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.RBAC.AuditLoggingOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -82,6 +88,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLog &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[0], &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.RBAC.AuditLoggingOptions.AuditLoggerConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -103,6 +112,9 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = { &envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[0], &envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.RBAC.PoliciesEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -127,6 +139,9 @@ const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = { &envoy_config_rbac_v3_Policy_submsgs[0], &envoy_config_rbac_v3_Policy__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Policy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -135,7 +150,7 @@ const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = { }) }; -static const upb_MiniTableSub envoy_config_rbac_v3_Permission_submsgs[10] = { +static const upb_MiniTableSub envoy_config_rbac_v3_Permission_submsgs[11] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init}, @@ -146,9 +161,10 @@ static const upb_MiniTableSub envoy_config_rbac_v3_Permission_submsgs[10] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__PathMatcher_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int32Range_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init}, }; -static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[12] = { +static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[13] = { {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -161,12 +177,16 @@ static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[12] = { {10, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {11, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {12, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = { &envoy_config_rbac_v3_Permission_submsgs[0], &envoy_config_rbac_v3_Permission__fields[0], - UPB_SIZE(16, 24), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Permission", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -181,7 +201,7 @@ const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = { {0x001000080a070052, &upb_pom_1bt_maxmaxb}, {0x001000080b08005a, &upb_pom_1bt_maxmaxb}, {0x001000080c090062, &upb_pom_1bt_maxmaxb}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001000080d0a006a, &upb_pom_1bt_maxmaxb}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) @@ -199,6 +219,9 @@ const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = { &envoy_config_rbac_v3_Permission_Set_submsgs[0], &envoy_config_rbac_v3_Permission_Set__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Permission.Set", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -238,6 +261,9 @@ const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = { &envoy_config_rbac_v3_Principal_submsgs[0], &envoy_config_rbac_v3_Principal__fields[0], UPB_SIZE(16, 24), 12, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Principal", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -270,6 +296,9 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = { &envoy_config_rbac_v3_Principal_Set_submsgs[0], &envoy_config_rbac_v3_Principal_Set__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Principal.Set", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -288,6 +317,9 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Authenticated_msg_init = &envoy_config_rbac_v3_Principal_Authenticated_submsgs[0], &envoy_config_rbac_v3_Principal_Authenticated__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Principal.Authenticated", +#endif }; static const upb_MiniTableField envoy_config_rbac_v3_Action__fields[2] = { @@ -299,6 +331,9 @@ const upb_MiniTable envoy__config__rbac__v3__Action_msg_init = { NULL, &envoy_config_rbac_v3_Action__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.rbac.v3.Action", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h index edccc69572..316e10867f 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb.h @@ -479,7 +479,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_metadata(const envo UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_name(envoy_config_route_v3_RouteConfiguration *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(72, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -629,7 +629,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_ } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_validate_clusters(envoy_config_route_v3_RouteConfiguration *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 64, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteConfiguration_mutable_validate_clusters(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteConfiguration_validate_clusters(msg); @@ -669,7 +669,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_add_request_headers_to_ } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_vhds(envoy_config_route_v3_RouteConfiguration *msg, envoy_config_route_v3_Vhds* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_Vhds* envoy_config_route_v3_RouteConfiguration_mutable_vhds(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { struct envoy_config_route_v3_Vhds* sub = (struct envoy_config_route_v3_Vhds*)envoy_config_route_v3_RouteConfiguration_vhds(msg); @@ -681,11 +681,11 @@ 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) { const upb_MiniTableField field = {10, UPB_SIZE(44, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {11, UPB_SIZE(48, 96), 66, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -757,11 +757,11 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_ignore_port_in_host_matching(envoy_config_route_v3_RouteConfiguration *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(60, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_ignore_path_parameters_in_path_matching(envoy_config_route_v3_RouteConfiguration *msg, bool value) { const upb_MiniTableField field = {15, UPB_SIZE(61, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_typed_per_filter_config_clear(envoy_config_route_v3_RouteConfiguration* msg) { const upb_MiniTableField field = {16, UPB_SIZE(64, 120), 0, 8, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -790,7 +790,7 @@ UPB_INLINE envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry* e } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_metadata(envoy_config_route_v3_RouteConfiguration *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {17, UPB_SIZE(68, 128), 67, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_RouteConfiguration_mutable_metadata(envoy_config_route_v3_RouteConfiguration* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_RouteConfiguration_metadata(msg); @@ -877,7 +877,7 @@ UPB_INLINE bool envoy_config_route_v3_Vhds_has_config_source(const envoy_config_ UPB_INLINE void envoy_config_route_v3_Vhds_set_config_source(envoy_config_route_v3_Vhds *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_route_v3_Vhds_mutable_config_source(envoy_config_route_v3_Vhds* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_route_v3_Vhds_config_source(msg); diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c index 146e1d3f5c..e5104c4c82 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.c @@ -57,6 +57,9 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init = { &envoy_config_route_v3_RouteConfiguration_submsgs[0], &envoy_config_route_v3_RouteConfiguration__fields[0], UPB_SIZE(80, 136), 17, kUpb_ExtMode_NonExtendable, 17, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteConfiguration", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -90,6 +93,9 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilter &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteConfiguration.TypedPerFilterConfigEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -108,6 +114,9 @@ const upb_MiniTable envoy__config__route__v3__Vhds_msg_init = { &envoy_config_route_v3_Vhds_submsgs[0], &envoy_config_route_v3_Vhds__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Vhds", +#endif }; static const upb_MiniTable *messages_layout[3] = { diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h index 9ad0428901..2031387493 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb.h @@ -683,7 +683,7 @@ UPB_INLINE bool envoy_config_route_v3_VirtualHost_has_metadata(const envoy_confi UPB_INLINE void envoy_config_route_v3_VirtualHost_set_name(envoy_config_route_v3_VirtualHost *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(96, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_route_v3_VirtualHost_mutable_domains(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -745,7 +745,7 @@ UPB_INLINE struct envoy_config_route_v3_Route* envoy_config_route_v3_VirtualHost } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_require_tls(envoy_config_route_v3_VirtualHost *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_VirtualCluster** envoy_config_route_v3_VirtualHost_mutable_virtual_clusters(envoy_config_route_v3_VirtualHost* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(24, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -839,7 +839,7 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_ } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_cors(envoy_config_route_v3_VirtualHost *msg, envoy_config_route_v3_CorsPolicy* value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 64, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_VirtualHost_mutable_cors(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct envoy_config_route_v3_CorsPolicy* sub = (struct envoy_config_route_v3_CorsPolicy*)envoy_config_route_v3_VirtualHost_cors(msg); @@ -937,7 +937,7 @@ UPB_INLINE bool envoy_config_route_v3_VirtualHost_add_request_headers_to_remove( } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_include_request_attempt_count(envoy_config_route_v3_VirtualHost *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(52, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_VirtualHost_typed_per_filter_config_clear(envoy_config_route_v3_VirtualHost* msg) { const upb_MiniTableField field = {15, UPB_SIZE(56, 112), 0, 6, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -966,7 +966,7 @@ UPB_INLINE envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry* envoy_co } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_retry_policy(envoy_config_route_v3_VirtualHost *msg, envoy_config_route_v3_RetryPolicy* value) { const upb_MiniTableField field = {16, UPB_SIZE(60, 120), 65, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_VirtualHost_mutable_retry_policy(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy* sub = (struct envoy_config_route_v3_RetryPolicy*)envoy_config_route_v3_VirtualHost_retry_policy(msg); @@ -978,7 +978,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_Virtu } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_hedge_policy(envoy_config_route_v3_VirtualHost *msg, envoy_config_route_v3_HedgePolicy* value) { const upb_MiniTableField field = {17, UPB_SIZE(64, 128), 66, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_VirtualHost_mutable_hedge_policy(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct envoy_config_route_v3_HedgePolicy* sub = (struct envoy_config_route_v3_HedgePolicy*)envoy_config_route_v3_VirtualHost_hedge_policy(msg); @@ -990,7 +990,7 @@ UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_Virtu } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_per_request_buffer_limit_bytes(envoy_config_route_v3_VirtualHost *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {18, UPB_SIZE(68, 136), 67, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_VirtualHost_mutable_per_request_buffer_limit_bytes(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_VirtualHost_per_request_buffer_limit_bytes(msg); @@ -1002,11 +1002,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_VirtualHost } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_include_attempt_count_in_response(envoy_config_route_v3_VirtualHost *msg, bool value) { const upb_MiniTableField field = {19, UPB_SIZE(72, 17), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_retry_policy_typed_config(envoy_config_route_v3_VirtualHost *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {20, UPB_SIZE(76, 144), 68, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_VirtualHost_mutable_retry_policy_typed_config(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_VirtualHost_retry_policy_typed_config(msg); @@ -1018,7 +1018,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_VirtualHost_mutable } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_matcher(envoy_config_route_v3_VirtualHost *msg, struct xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {21, UPB_SIZE(80, 152), 69, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_config_route_v3_VirtualHost_mutable_matcher(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_config_route_v3_VirtualHost_matcher(msg); @@ -1060,11 +1060,11 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_include_is_timeout_retry_header(envoy_config_route_v3_VirtualHost *msg, bool value) { const upb_MiniTableField field = {23, UPB_SIZE(88, 18), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_VirtualHost_set_metadata(envoy_config_route_v3_VirtualHost *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {24, UPB_SIZE(92, 168), 70, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_VirtualHost_mutable_metadata(envoy_config_route_v3_VirtualHost* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_VirtualHost_metadata(msg); @@ -1151,7 +1151,7 @@ UPB_INLINE bool envoy_config_route_v3_FilterAction_has_action(const envoy_config UPB_INLINE void envoy_config_route_v3_FilterAction_set_action(envoy_config_route_v3_FilterAction *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterAction_mutable_action(envoy_config_route_v3_FilterAction* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_FilterAction_action(msg); @@ -1655,7 +1655,7 @@ UPB_INLINE upb_StringView envoy_config_route_v3_Route_stat_prefix(const envoy_co UPB_INLINE void envoy_config_route_v3_Route_set_match(envoy_config_route_v3_Route *msg, envoy_config_route_v3_RouteMatch* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteMatch* envoy_config_route_v3_Route_mutable_match(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteMatch* sub = (struct envoy_config_route_v3_RouteMatch*)envoy_config_route_v3_Route_match(msg); @@ -1667,7 +1667,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteMatch* envoy_config_route_v3_Route_ } UPB_INLINE void envoy_config_route_v3_Route_set_route(envoy_config_route_v3_Route *msg, envoy_config_route_v3_RouteAction* value) { const upb_MiniTableField field = {2, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction* envoy_config_route_v3_Route_mutable_route(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction* sub = (struct envoy_config_route_v3_RouteAction*)envoy_config_route_v3_Route_route(msg); @@ -1679,7 +1679,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction* envoy_config_route_v3_Route } UPB_INLINE void envoy_config_route_v3_Route_set_redirect(envoy_config_route_v3_Route *msg, envoy_config_route_v3_RedirectAction* value) { const upb_MiniTableField field = {3, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RedirectAction* envoy_config_route_v3_Route_mutable_redirect(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_RedirectAction* sub = (struct envoy_config_route_v3_RedirectAction*)envoy_config_route_v3_Route_redirect(msg); @@ -1691,7 +1691,7 @@ UPB_INLINE struct envoy_config_route_v3_RedirectAction* envoy_config_route_v3_Ro } UPB_INLINE void envoy_config_route_v3_Route_set_metadata(envoy_config_route_v3_Route *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Route_mutable_metadata(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_Route_metadata(msg); @@ -1703,7 +1703,7 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_Route_mut } UPB_INLINE void envoy_config_route_v3_Route_set_decorator(envoy_config_route_v3_Route *msg, envoy_config_route_v3_Decorator* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 32), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_Decorator* envoy_config_route_v3_Route_mutable_decorator(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_Decorator* sub = (struct envoy_config_route_v3_Decorator*)envoy_config_route_v3_Route_decorator(msg); @@ -1715,7 +1715,7 @@ UPB_INLINE struct envoy_config_route_v3_Decorator* envoy_config_route_v3_Route_m } UPB_INLINE void envoy_config_route_v3_Route_set_direct_response(envoy_config_route_v3_Route *msg, envoy_config_route_v3_DirectResponseAction* value) { const upb_MiniTableField field = {7, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_DirectResponseAction* envoy_config_route_v3_Route_mutable_direct_response(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_DirectResponseAction* sub = (struct envoy_config_route_v3_DirectResponseAction*)envoy_config_route_v3_Route_direct_response(msg); @@ -1868,11 +1868,11 @@ UPB_INLINE envoy_config_route_v3_Route_TypedPerFilterConfigEntry* envoy_config_r } UPB_INLINE void envoy_config_route_v3_Route_set_name(envoy_config_route_v3_Route *msg, upb_StringView value) { const upb_MiniTableField field = {14, UPB_SIZE(60, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_Route_set_tracing(envoy_config_route_v3_Route *msg, envoy_config_route_v3_Tracing* value) { const upb_MiniTableField field = {15, UPB_SIZE(44, 96), 67, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_Tracing* envoy_config_route_v3_Route_mutable_tracing(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_Tracing* sub = (struct envoy_config_route_v3_Tracing*)envoy_config_route_v3_Route_tracing(msg); @@ -1884,7 +1884,7 @@ UPB_INLINE struct envoy_config_route_v3_Tracing* envoy_config_route_v3_Route_mut } UPB_INLINE void envoy_config_route_v3_Route_set_per_request_buffer_limit_bytes(envoy_config_route_v3_Route *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {16, UPB_SIZE(48, 104), 68, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_Route_mutable_per_request_buffer_limit_bytes(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_Route_per_request_buffer_limit_bytes(msg); @@ -1896,7 +1896,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_Route_mutab } UPB_INLINE void envoy_config_route_v3_Route_set_filter_action(envoy_config_route_v3_Route *msg, envoy_config_route_v3_FilterAction* value) { const upb_MiniTableField field = {17, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_FilterAction* envoy_config_route_v3_Route_mutable_filter_action(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_FilterAction* sub = (struct envoy_config_route_v3_FilterAction*)envoy_config_route_v3_Route_filter_action(msg); @@ -1908,7 +1908,7 @@ UPB_INLINE struct envoy_config_route_v3_FilterAction* envoy_config_route_v3_Rout } UPB_INLINE void envoy_config_route_v3_Route_set_non_forwarding_action(envoy_config_route_v3_Route *msg, envoy_config_route_v3_NonForwardingAction* value) { const upb_MiniTableField field = {18, UPB_SIZE(56, 128), UPB_SIZE(-53, -13), 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_NonForwardingAction* envoy_config_route_v3_Route_mutable_non_forwarding_action(envoy_config_route_v3_Route* msg, upb_Arena* arena) { struct envoy_config_route_v3_NonForwardingAction* sub = (struct envoy_config_route_v3_NonForwardingAction*)envoy_config_route_v3_Route_non_forwarding_action(msg); @@ -1920,7 +1920,7 @@ UPB_INLINE struct envoy_config_route_v3_NonForwardingAction* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_Route_set_stat_prefix(envoy_config_route_v3_Route *msg, upb_StringView value) { const upb_MiniTableField field = {19, UPB_SIZE(68, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.Route.TypedPerFilterConfigEntry */ @@ -2098,11 +2098,11 @@ UPB_INLINE struct envoy_config_route_v3_WeightedCluster_ClusterWeight* envoy_con } UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_runtime_key_prefix(envoy_config_route_v3_WeightedCluster *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_total_weight(envoy_config_route_v3_WeightedCluster *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 56), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedCluster_mutable_total_weight(envoy_config_route_v3_WeightedCluster* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_WeightedCluster_total_weight(msg); @@ -2114,7 +2114,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedClu } UPB_INLINE void envoy_config_route_v3_WeightedCluster_set_header_name(envoy_config_route_v3_WeightedCluster *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), UPB_SIZE(-21, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.WeightedCluster.ClusterWeight */ @@ -2394,11 +2394,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_WeightedCluster_ClusterWeight_cl UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_name(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(52, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_weight(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedCluster_ClusterWeight_mutable_weight(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_WeightedCluster_ClusterWeight_weight(msg); @@ -2410,7 +2410,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_WeightedClu } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_metadata_match(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_WeightedCluster_ClusterWeight_mutable_metadata_match(envoy_config_route_v3_WeightedCluster_ClusterWeight* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_WeightedCluster_ClusterWeight_metadata_match(msg); @@ -2563,11 +2563,11 @@ UPB_INLINE envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterCon } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_host_rewrite_literal(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, upb_StringView value) { const upb_MiniTableField field = {11, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_WeightedCluster_ClusterWeight_set_cluster_header(envoy_config_route_v3_WeightedCluster_ClusterWeight *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(60, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry */ @@ -2658,7 +2658,7 @@ UPB_INLINE bool envoy_config_route_v3_ClusterSpecifierPlugin_is_optional(const e UPB_INLINE void envoy_config_route_v3_ClusterSpecifierPlugin_set_extension(envoy_config_route_v3_ClusterSpecifierPlugin *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_ClusterSpecifierPlugin_mutable_extension(envoy_config_route_v3_ClusterSpecifierPlugin* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_ClusterSpecifierPlugin_extension(msg); @@ -2670,7 +2670,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_ClusterSpecifierPlugin_set_is_optional(envoy_config_route_v3_ClusterSpecifierPlugin *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteMatch */ @@ -2982,15 +2982,15 @@ UPB_INLINE bool envoy_config_route_v3_RouteMatch_has_path_match_policy(const env UPB_INLINE void envoy_config_route_v3_RouteMatch_set_prefix(envoy_config_route_v3_RouteMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path(envoy_config_route_v3_RouteMatch *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_case_sensitive(envoy_config_route_v3_RouteMatch *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_mutable_case_sensitive(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_case_sensitive(msg); @@ -3062,7 +3062,7 @@ UPB_INLINE struct envoy_config_route_v3_QueryParameterMatcher* envoy_config_rout } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_grpc(envoy_config_route_v3_RouteMatch *msg, envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* value) { const upb_MiniTableField field = {8, UPB_SIZE(24, 56), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_config_route_v3_RouteMatch_mutable_grpc(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* sub = (struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions*)envoy_config_route_v3_RouteMatch_grpc(msg); @@ -3074,7 +3074,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteMatch_GrpcRouteMatchOptions* envoy_ } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_runtime_fraction(envoy_config_route_v3_RouteMatch *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { const upb_MiniTableField field = {9, UPB_SIZE(28, 64), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_RouteMatch_mutable_runtime_fraction(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_RouteMatch_runtime_fraction(msg); @@ -3086,7 +3086,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_safe_regex(envoy_config_route_v3_RouteMatch *msg, struct envoy_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_RouteMatch_mutable_safe_regex(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_config_route_v3_RouteMatch_safe_regex(msg); @@ -3098,7 +3098,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_Rout } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_tls_context(envoy_config_route_v3_RouteMatch *msg, envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* value) { const upb_MiniTableField field = {11, UPB_SIZE(32, 72), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy_config_route_v3_RouteMatch_mutable_tls_context(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* sub = (struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions*)envoy_config_route_v3_RouteMatch_tls_context(msg); @@ -3110,7 +3110,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* envoy } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_connect_matcher(envoy_config_route_v3_RouteMatch *msg, envoy_config_route_v3_RouteMatch_ConnectMatcher* value) { const upb_MiniTableField field = {12, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteMatch_ConnectMatcher* envoy_config_route_v3_RouteMatch_mutable_connect_matcher(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteMatch_ConnectMatcher* sub = (struct envoy_config_route_v3_RouteMatch_ConnectMatcher*)envoy_config_route_v3_RouteMatch_connect_matcher(msg); @@ -3152,11 +3152,11 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher* envoy_config_route_v3_R } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path_separated_prefix(envoy_config_route_v3_RouteMatch *msg, upb_StringView value) { const upb_MiniTableField field = {14, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteMatch_set_path_match_policy(envoy_config_route_v3_RouteMatch *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {15, UPB_SIZE(44, 16), UPB_SIZE(-41, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteMatch_mutable_path_match_policy(envoy_config_route_v3_RouteMatch* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteMatch_path_match_policy(msg); @@ -3276,7 +3276,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_has_vali UPB_INLINE void envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_set_presented(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_mutable_presented(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_presented(msg); @@ -3288,7 +3288,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_Tl } UPB_INLINE void envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_set_validated(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_mutable_validated(envoy_config_route_v3_RouteMatch_TlsContextMatchOptions* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_validated(msg); @@ -3378,54 +3378,54 @@ typedef enum { envoy_config_route_v3_CorsPolicy_enabled_specifier_NOT_SET = 0 } envoy_config_route_v3_CorsPolicy_enabled_specifier_oneofcases; UPB_INLINE envoy_config_route_v3_CorsPolicy_enabled_specifier_oneofcases envoy_config_route_v3_CorsPolicy_enabled_specifier_case(const envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_config_route_v3_CorsPolicy_enabled_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_allow_methods(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_CorsPolicy_allow_methods(const envoy_config_route_v3_CorsPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_allow_headers(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_CorsPolicy_allow_headers(const envoy_config_route_v3_CorsPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_expose_headers(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(52, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_CorsPolicy_expose_headers(const envoy_config_route_v3_CorsPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {4, UPB_SIZE(52, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_max_age(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {5, UPB_SIZE(60, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, 64, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_CorsPolicy_max_age(const envoy_config_route_v3_CorsPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {5, UPB_SIZE(60, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, 64, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -3447,19 +3447,19 @@ UPB_INLINE bool envoy_config_route_v3_CorsPolicy_has_allow_credentials(const env return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_filter_enabled(envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_CorsPolicy_filter_enabled(const envoy_config_route_v3_CorsPolicy* msg) { const struct envoy_config_core_v3_RuntimeFractionalPercent* default_val = NULL; const struct envoy_config_core_v3_RuntimeFractionalPercent* ret; - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool envoy_config_route_v3_CorsPolicy_has_filter_enabled(const envoy_config_route_v3_CorsPolicy* msg) { - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_shadow_enabled(envoy_config_route_v3_CorsPolicy* msg) { @@ -3526,26 +3526,42 @@ UPB_INLINE bool envoy_config_route_v3_CorsPolicy_has_allow_private_network_acces const upb_MiniTableField field = {12, UPB_SIZE(28, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_config_route_v3_CorsPolicy_clear_forward_not_matching_preflights(envoy_config_route_v3_CorsPolicy* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_forward_not_matching_preflights(const envoy_config_route_v3_CorsPolicy* msg) { + const struct google_protobuf_BoolValue* default_val = NULL; + const struct google_protobuf_BoolValue* ret; + const upb_MiniTableField field = {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_route_v3_CorsPolicy_has_forward_not_matching_preflights(const envoy_config_route_v3_CorsPolicy* msg) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_methods(envoy_config_route_v3_CorsPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_headers(envoy_config_route_v3_CorsPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_expose_headers(envoy_config_route_v3_CorsPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {4, UPB_SIZE(52, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_max_age(envoy_config_route_v3_CorsPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {5, UPB_SIZE(60, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {5, 64, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_credentials(envoy_config_route_v3_CorsPolicy *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 80), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mutable_allow_credentials(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_CorsPolicy_allow_credentials(msg); @@ -3556,8 +3572,8 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mu return sub; } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_filter_enabled(envoy_config_route_v3_CorsPolicy *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { - const upb_MiniTableField field = {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_CorsPolicy_mutable_filter_enabled(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_CorsPolicy_filter_enabled(msg); @@ -3569,7 +3585,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_shadow_enabled(envoy_config_route_v3_CorsPolicy *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { const upb_MiniTableField field = {10, UPB_SIZE(20, 88), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_CorsPolicy_mutable_shadow_enabled(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_CorsPolicy_shadow_enabled(msg); @@ -3611,7 +3627,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_Cor } UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_allow_private_network_access(envoy_config_route_v3_CorsPolicy *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {12, UPB_SIZE(28, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mutable_allow_private_network_access(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_CorsPolicy_allow_private_network_access(msg); @@ -3621,6 +3637,18 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mu } return sub; } +UPB_INLINE void envoy_config_route_v3_CorsPolicy_set_forward_not_matching_preflights(envoy_config_route_v3_CorsPolicy *msg, struct google_protobuf_BoolValue* value) { + const upb_MiniTableField field = {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_CorsPolicy_mutable_forward_not_matching_preflights(envoy_config_route_v3_CorsPolicy* msg, upb_Arena* arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_CorsPolicy_forward_not_matching_preflights(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_Message_New(&google__protobuf__BoolValue_msg_init, arena); + if (sub) envoy_config_route_v3_CorsPolicy_set_forward_not_matching_preflights(msg, sub); + } + return sub; +} /* envoy.config.route.v3.RouteAction */ @@ -4274,15 +4302,15 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_has_path_rewrite_policy(const UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster_header(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_weighted_clusters(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_WeightedCluster* value) { const upb_MiniTableField field = {3, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_RouteAction_mutable_weighted_clusters(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_WeightedCluster* sub = (struct envoy_config_route_v3_WeightedCluster*)envoy_config_route_v3_RouteAction_weighted_clusters(msg); @@ -4294,7 +4322,7 @@ UPB_INLINE struct envoy_config_route_v3_WeightedCluster* envoy_config_route_v3_R } UPB_INLINE void envoy_config_route_v3_RouteAction_set_metadata_match(envoy_config_route_v3_RouteAction *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 72), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_RouteAction_mutable_metadata_match(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_route_v3_RouteAction_metadata_match(msg); @@ -4306,15 +4334,15 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_route_v3_RouteActi } UPB_INLINE void envoy_config_route_v3_RouteAction_set_prefix_rewrite(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(132, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_literal(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(116, 40), UPB_SIZE(-93, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_auto_host_rewrite(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {7, UPB_SIZE(116, 40), UPB_SIZE(-93, -25), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_mutable_auto_host_rewrite(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_auto_host_rewrite(msg); @@ -4326,7 +4354,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_m } UPB_INLINE void envoy_config_route_v3_RouteAction_set_timeout(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {8, UPB_SIZE(16, 96), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_timeout(msg); @@ -4338,7 +4366,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mu } UPB_INLINE void envoy_config_route_v3_RouteAction_set_retry_policy(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_RetryPolicy* value) { const upb_MiniTableField field = {9, UPB_SIZE(20, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_RouteAction_mutable_retry_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy* sub = (struct envoy_config_route_v3_RetryPolicy*)envoy_config_route_v3_RouteAction_retry_policy(msg); @@ -4350,7 +4378,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy* envoy_config_route_v3_Route } UPB_INLINE void envoy_config_route_v3_RouteAction_set_priority(envoy_config_route_v3_RouteAction *msg, int32_t value) { const upb_MiniTableField field = {11, UPB_SIZE(24, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_RateLimit** envoy_config_route_v3_RouteAction_mutable_rate_limits(envoy_config_route_v3_RouteAction* msg, size_t* size) { upb_MiniTableField field = {13, UPB_SIZE(28, 112), 0, 5, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -4384,7 +4412,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit* envoy_config_route_v3_RouteAc } UPB_INLINE void envoy_config_route_v3_RouteAction_set_include_vh_rate_limits(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {14, UPB_SIZE(32, 120), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_mutable_include_vh_rate_limits(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_include_vh_rate_limits(msg); @@ -4426,7 +4454,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy* envoy_config_rou } UPB_INLINE void envoy_config_route_v3_RouteAction_set_cors(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_CorsPolicy* value) { const upb_MiniTableField field = {17, UPB_SIZE(40, 136), 68, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_RouteAction_mutable_cors(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_CorsPolicy* sub = (struct envoy_config_route_v3_CorsPolicy*)envoy_config_route_v3_RouteAction_cors(msg); @@ -4438,11 +4466,11 @@ UPB_INLINE struct envoy_config_route_v3_CorsPolicy* envoy_config_route_v3_RouteA } UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster_not_found_response_code(envoy_config_route_v3_RouteAction *msg, int32_t value) { const upb_MiniTableField field = {20, UPB_SIZE(44, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_grpc_timeout(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {23, UPB_SIZE(48, 144), 69, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_max_grpc_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_max_grpc_timeout(msg); @@ -4454,7 +4482,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mu } UPB_INLINE void envoy_config_route_v3_RouteAction_set_idle_timeout(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {24, UPB_SIZE(52, 152), 70, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_idle_timeout(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_idle_timeout(msg); @@ -4496,11 +4524,11 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_UpgradeConfig* envoy_config_ } UPB_INLINE void envoy_config_route_v3_RouteAction_set_internal_redirect_action(envoy_config_route_v3_RouteAction *msg, int32_t value) { const upb_MiniTableField field = {26, UPB_SIZE(60, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_hedge_policy(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_HedgePolicy* value) { const upb_MiniTableField field = {27, UPB_SIZE(64, 168), 71, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_RouteAction_mutable_hedge_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_HedgePolicy* sub = (struct envoy_config_route_v3_HedgePolicy*)envoy_config_route_v3_RouteAction_hedge_policy(msg); @@ -4512,7 +4540,7 @@ UPB_INLINE struct envoy_config_route_v3_HedgePolicy* envoy_config_route_v3_Route } UPB_INLINE void envoy_config_route_v3_RouteAction_set_grpc_timeout_offset(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {28, UPB_SIZE(68, 176), 72, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mutable_grpc_timeout_offset(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_grpc_timeout_offset(msg); @@ -4524,7 +4552,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_mu } UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_header(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {29, UPB_SIZE(116, 40), UPB_SIZE(-93, -25), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_RouteAction_RequestMirrorPolicy** envoy_config_route_v3_RouteAction_mutable_request_mirror_policies(envoy_config_route_v3_RouteAction* msg, size_t* size) { upb_MiniTableField field = {30, UPB_SIZE(72, 184), 0, 14, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -4558,7 +4586,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_RequestMirrorPolicy* envoy_c } UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_internal_redirects(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {31, UPB_SIZE(76, 192), 73, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteAction_mutable_max_internal_redirects(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RouteAction_max_internal_redirects(msg); @@ -4570,7 +4598,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteAction } UPB_INLINE void envoy_config_route_v3_RouteAction_set_regex_rewrite(envoy_config_route_v3_RouteAction *msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute* value) { const upb_MiniTableField field = {32, UPB_SIZE(80, 200), 74, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_mutable_regex_rewrite(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_regex_rewrite(msg); @@ -4582,7 +4610,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RouteAction_set_retry_policy_typed_config(envoy_config_route_v3_RouteAction *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {33, UPB_SIZE(84, 208), 75, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RouteAction_mutable_retry_policy_typed_config(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RouteAction_retry_policy_typed_config(msg); @@ -4594,7 +4622,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RouteAction_mutable } UPB_INLINE void envoy_config_route_v3_RouteAction_set_internal_redirect_policy(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_InternalRedirectPolicy* value) { const upb_MiniTableField field = {34, UPB_SIZE(88, 216), 76, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_InternalRedirectPolicy* envoy_config_route_v3_RouteAction_mutable_internal_redirect_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_InternalRedirectPolicy* sub = (struct envoy_config_route_v3_InternalRedirectPolicy*)envoy_config_route_v3_RouteAction_internal_redirect_policy(msg); @@ -4606,7 +4634,7 @@ UPB_INLINE struct envoy_config_route_v3_InternalRedirectPolicy* envoy_config_rou } UPB_INLINE void envoy_config_route_v3_RouteAction_set_host_rewrite_path_regex(envoy_config_route_v3_RouteAction *msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute* value) { const upb_MiniTableField field = {35, UPB_SIZE(116, 40), UPB_SIZE(-93, -25), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_mutable_host_rewrite_path_regex(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_host_rewrite_path_regex(msg); @@ -4618,7 +4646,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RouteAction_set_max_stream_duration(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_RouteAction_MaxStreamDuration* value) { const upb_MiniTableField field = {36, UPB_SIZE(96, 224), 77, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_config_route_v3_RouteAction_mutable_max_stream_duration(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_MaxStreamDuration* sub = (struct envoy_config_route_v3_RouteAction_MaxStreamDuration*)envoy_config_route_v3_RouteAction_max_stream_duration(msg); @@ -4630,15 +4658,15 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_MaxStreamDuration* envoy_con } UPB_INLINE void envoy_config_route_v3_RouteAction_set_cluster_specifier_plugin(envoy_config_route_v3_RouteAction *msg, upb_StringView value) { const upb_MiniTableField field = {37, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_append_x_forwarded_host(envoy_config_route_v3_RouteAction *msg, bool value) { const upb_MiniTableField field = {38, UPB_SIZE(100, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_set_inline_cluster_specifier_plugin(envoy_config_route_v3_RouteAction *msg, envoy_config_route_v3_ClusterSpecifierPlugin* value) { const upb_MiniTableField field = {39, UPB_SIZE(124, 56), UPB_SIZE(-105, -33), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_route_v3_RouteAction_mutable_inline_cluster_specifier_plugin(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_route_v3_ClusterSpecifierPlugin* sub = (struct envoy_config_route_v3_ClusterSpecifierPlugin*)envoy_config_route_v3_RouteAction_inline_cluster_specifier_plugin(msg); @@ -4650,7 +4678,7 @@ UPB_INLINE struct envoy_config_route_v3_ClusterSpecifierPlugin* envoy_config_rou } UPB_INLINE void envoy_config_route_v3_RouteAction_set_early_data_policy(envoy_config_route_v3_RouteAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {40, UPB_SIZE(108, 232), 78, 22, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteAction_mutable_early_data_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteAction_early_data_policy(msg); @@ -4662,7 +4690,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_RouteAction_set_path_rewrite_policy(envoy_config_route_v3_RouteAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {41, UPB_SIZE(112, 240), 79, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RouteAction_mutable_path_rewrite_policy(envoy_config_route_v3_RouteAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RouteAction_path_rewrite_policy(msg); @@ -4710,13 +4738,13 @@ UPB_INLINE char* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_serialize return ptr; } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_clear_cluster(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { - const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_RequestMirrorPolicy_cluster(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -4754,25 +4782,37 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_RequestMirrorPolicy_has_trace_ return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_clear_cluster_header(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { - const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_RequestMirrorPolicy_cluster_header(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_clear_disable_shadow_host_suffix_append(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_config_route_v3_RouteAction_RequestMirrorPolicy_disable_shadow_host_suffix_append(const envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_cluster(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_runtime_fraction(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_mutable_runtime_fraction(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_route_v3_RouteAction_RequestMirrorPolicy_runtime_fraction(msg); @@ -4784,7 +4824,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_trace_sampled(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_RequestMirrorPolicy_mutable_trace_sampled(envoy_config_route_v3_RouteAction_RequestMirrorPolicy* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_RequestMirrorPolicy_trace_sampled(msg); @@ -4795,8 +4835,12 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_R return sub; } UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_cluster_header(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, upb_StringView value) { - const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_route_v3_RouteAction_RequestMirrorPolicy_set_disable_shadow_host_suffix_append(envoy_config_route_v3_RouteAction_RequestMirrorPolicy *msg, bool value) { + const upb_MiniTableField field = {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.HashPolicy */ @@ -4943,7 +4987,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_HashPolicy_has_filter_state(co UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_header(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_Header* value) { const upb_MiniTableField field = {1, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_config_route_v3_RouteAction_HashPolicy_mutable_header(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_Header* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Header*)envoy_config_route_v3_RouteAction_HashPolicy_header(msg); @@ -4955,7 +4999,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Header* envoy_con } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_cookie(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_Cookie* value) { const upb_MiniTableField field = {2, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_config_route_v3_RouteAction_HashPolicy_mutable_cookie(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie*)envoy_config_route_v3_RouteAction_HashPolicy_cookie(msg); @@ -4967,7 +5011,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_Cookie* envoy_con } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_connection_properties(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* value) { const upb_MiniTableField field = {3, 16, -13, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* envoy_config_route_v3_RouteAction_HashPolicy_mutable_connection_properties(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties*)envoy_config_route_v3_RouteAction_HashPolicy_connection_properties(msg); @@ -4979,11 +5023,11 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_ConnectionPropert } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_terminal(envoy_config_route_v3_RouteAction_HashPolicy *msg, bool value) { const upb_MiniTableField field = {4, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_query_parameter(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* value) { const upb_MiniTableField field = {5, 16, -13, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* envoy_config_route_v3_RouteAction_HashPolicy_mutable_query_parameter(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter*)envoy_config_route_v3_RouteAction_HashPolicy_query_parameter(msg); @@ -4995,7 +5039,7 @@ UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter* e } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_set_filter_state(envoy_config_route_v3_RouteAction_HashPolicy *msg, envoy_config_route_v3_RouteAction_HashPolicy_FilterState* value) { const upb_MiniTableField field = {6, 16, -13, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState* envoy_config_route_v3_RouteAction_HashPolicy_mutable_filter_state(envoy_config_route_v3_RouteAction_HashPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState* sub = (struct envoy_config_route_v3_RouteAction_HashPolicy_FilterState*)envoy_config_route_v3_RouteAction_HashPolicy_filter_state(msg); @@ -5073,11 +5117,11 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_HashPolicy_Header_has_regex_re UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Header_set_header_name(envoy_config_route_v3_RouteAction_HashPolicy_Header *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Header_set_regex_rewrite(envoy_config_route_v3_RouteAction_HashPolicy_Header *msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RouteAction_HashPolicy_Header_mutable_regex_rewrite(envoy_config_route_v3_RouteAction_HashPolicy_Header* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RouteAction_HashPolicy_Header_regex_rewrite(msg); @@ -5151,11 +5195,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_HashPolicy_CookieAtt UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_set_name(envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute_set_value(envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.HashPolicy.Cookie */ @@ -5269,11 +5313,11 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_RouteAction_HashPolicy_Cookie_attri UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_name(envoy_config_route_v3_RouteAction_HashPolicy_Cookie *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_ttl(envoy_config_route_v3_RouteAction_HashPolicy_Cookie *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_HashPolicy_Cookie_mutable_ttl(envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_HashPolicy_Cookie_ttl(msg); @@ -5285,7 +5329,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_Ha } UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_Cookie_set_path(envoy_config_route_v3_RouteAction_HashPolicy_Cookie *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute** envoy_config_route_v3_RouteAction_HashPolicy_Cookie_mutable_attributes(envoy_config_route_v3_RouteAction_HashPolicy_Cookie* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -5369,7 +5413,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_HashPolicy_ConnectionPropertie UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties_set_source_ip(envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter */ @@ -5423,7 +5467,7 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_HashPolicy_QueryPara UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter_set_name(envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.HashPolicy.FilterState */ @@ -5477,7 +5521,7 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RouteAction_HashPolicy_FilterSta UPB_INLINE void envoy_config_route_v3_RouteAction_HashPolicy_FilterState_set_key(envoy_config_route_v3_RouteAction_HashPolicy_FilterState *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.UpgradeConfig */ @@ -5563,11 +5607,11 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_UpgradeConfig_has_connect_conf UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_upgrade_type(envoy_config_route_v3_RouteAction_UpgradeConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_enabled(envoy_config_route_v3_RouteAction_UpgradeConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_UpgradeConfig_mutable_enabled(envoy_config_route_v3_RouteAction_UpgradeConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RouteAction_UpgradeConfig_enabled(msg); @@ -5579,7 +5623,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteAction_U } UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_set_connect_config(envoy_config_route_v3_RouteAction_UpgradeConfig *msg, envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_mutable_connect_config(envoy_config_route_v3_RouteAction_UpgradeConfig* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* sub = (struct envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig*)envoy_config_route_v3_RouteAction_UpgradeConfig_connect_config(msg); @@ -5657,7 +5701,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_al 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_mutable_proxy_protocol_config(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ProxyProtocolConfig* sub = (struct envoy_config_core_v3_ProxyProtocolConfig*)envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_proxy_protocol_config(msg); @@ -5669,7 +5713,7 @@ UPB_INLINE struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_route_v } UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_set_allow_post(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RouteAction.MaxStreamDuration */ @@ -5759,7 +5803,7 @@ UPB_INLINE bool envoy_config_route_v3_RouteAction_MaxStreamDuration_has_grpc_tim UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_max_stream_duration(envoy_config_route_v3_RouteAction_MaxStreamDuration *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_max_stream_duration(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_max_stream_duration(msg); @@ -5771,7 +5815,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_Ma } UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_grpc_timeout_header_max(envoy_config_route_v3_RouteAction_MaxStreamDuration *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_grpc_timeout_header_max(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_grpc_timeout_header_max(msg); @@ -5783,7 +5827,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_Ma } UPB_INLINE void envoy_config_route_v3_RouteAction_MaxStreamDuration_set_grpc_timeout_header_offset(envoy_config_route_v3_RouteAction_MaxStreamDuration *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RouteAction_MaxStreamDuration_mutable_grpc_timeout_header_offset(envoy_config_route_v3_RouteAction_MaxStreamDuration* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RouteAction_MaxStreamDuration_grpc_timeout_header_offset(msg); @@ -6113,11 +6157,11 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_has_per_try_idle_timeout(const UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_on(envoy_config_route_v3_RetryPolicy *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(56, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_num_retries(envoy_config_route_v3_RetryPolicy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RetryPolicy_mutable_num_retries(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RetryPolicy_num_retries(msg); @@ -6129,7 +6173,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RetryPolicy } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_per_try_timeout(envoy_config_route_v3_RetryPolicy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mutable_per_try_timeout(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_per_try_timeout(msg); @@ -6141,7 +6185,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mu } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_priority(envoy_config_route_v3_RetryPolicy *msg, envoy_config_route_v3_RetryPolicy_RetryPriority* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryPriority* envoy_config_route_v3_RetryPolicy_mutable_retry_priority(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy_RetryPriority* sub = (struct envoy_config_route_v3_RetryPolicy_RetryPriority*)envoy_config_route_v3_RetryPolicy_retry_priority(msg); @@ -6183,7 +6227,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryHostPredicate* envoy_co } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_host_selection_retry_max_attempts(envoy_config_route_v3_RetryPolicy *msg, int64_t value) { const upb_MiniTableField field = {6, 64, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint32_t* envoy_config_route_v3_RetryPolicy_mutable_retriable_status_codes(envoy_config_route_v3_RetryPolicy* msg, size_t* size) { upb_MiniTableField field = {7, UPB_SIZE(28, 72), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -6215,7 +6259,7 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_add_retriable_status_codes(env } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_retry_back_off(envoy_config_route_v3_RetryPolicy *msg, envoy_config_route_v3_RetryPolicy_RetryBackOff* value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 80), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RetryBackOff* envoy_config_route_v3_RetryPolicy_mutable_retry_back_off(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy_RetryBackOff* sub = (struct envoy_config_route_v3_RetryPolicy_RetryBackOff*)envoy_config_route_v3_RetryPolicy_retry_back_off(msg); @@ -6287,7 +6331,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Ret } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_rate_limited_retry_back_off(envoy_config_route_v3_RetryPolicy *msg, envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* value) { const upb_MiniTableField field = {11, UPB_SIZE(44, 104), 68, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* envoy_config_route_v3_RetryPolicy_mutable_rate_limited_retry_back_off(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* sub = (struct envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff*)envoy_config_route_v3_RetryPolicy_rate_limited_retry_back_off(msg); @@ -6329,7 +6373,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_RetryPolicy_set_per_try_idle_timeout(envoy_config_route_v3_RetryPolicy *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {13, UPB_SIZE(52, 120), 69, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_mutable_per_try_idle_timeout(envoy_config_route_v3_RetryPolicy* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_per_try_idle_timeout(msg); @@ -6416,11 +6460,11 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_RetryPriority_has_typed_config UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryPriority_set_name(envoy_config_route_v3_RetryPolicy_RetryPriority *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryPriority_set_typed_config(envoy_config_route_v3_RetryPolicy_RetryPriority *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_RetryPriority_mutable_typed_config(envoy_config_route_v3_RetryPolicy_RetryPriority* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RetryPolicy_RetryPriority_typed_config(msg); @@ -6507,11 +6551,11 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_RetryHostPredicate_has_typed_c UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryHostPredicate_set_name(envoy_config_route_v3_RetryPolicy_RetryHostPredicate *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryHostPredicate_set_typed_config(envoy_config_route_v3_RetryPolicy_RetryHostPredicate *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_RetryPolicy_RetryHostPredicate_mutable_typed_config(envoy_config_route_v3_RetryPolicy_RetryHostPredicate* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_RetryPolicy_RetryHostPredicate_typed_config(msg); @@ -6593,7 +6637,7 @@ UPB_INLINE bool envoy_config_route_v3_RetryPolicy_RetryBackOff_has_max_interval( UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryBackOff_set_base_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RetryBackOff_mutable_base_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RetryBackOff_base_interval(msg); @@ -6605,7 +6649,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_Re } UPB_INLINE void envoy_config_route_v3_RetryPolicy_RetryBackOff_set_max_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RetryBackOff_mutable_max_interval(envoy_config_route_v3_RetryPolicy_RetryBackOff* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RetryBackOff_max_interval(msg); @@ -6679,11 +6723,11 @@ UPB_INLINE int32_t envoy_config_route_v3_RetryPolicy_ResetHeader_format(const en UPB_INLINE void envoy_config_route_v3_RetryPolicy_ResetHeader_set_name(envoy_config_route_v3_RetryPolicy_ResetHeader *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RetryPolicy_ResetHeader_set_format(envoy_config_route_v3_RetryPolicy_ResetHeader *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff */ @@ -6803,7 +6847,7 @@ UPB_INLINE struct envoy_config_route_v3_RetryPolicy_ResetHeader* envoy_config_ro } UPB_INLINE void envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_set_max_interval(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_mutable_max_interval(envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_max_interval(msg); @@ -6897,7 +6941,7 @@ UPB_INLINE bool envoy_config_route_v3_HedgePolicy_hedge_on_per_try_timeout(const UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_initial_requests(envoy_config_route_v3_HedgePolicy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_HedgePolicy_mutable_initial_requests(envoy_config_route_v3_HedgePolicy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_HedgePolicy_initial_requests(msg); @@ -6909,7 +6953,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_HedgePolicy } UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_additional_request_chance(envoy_config_route_v3_HedgePolicy *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_HedgePolicy_mutable_additional_request_chance(envoy_config_route_v3_HedgePolicy* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_HedgePolicy_additional_request_chance(msg); @@ -6921,7 +6965,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_HedgePo } UPB_INLINE void envoy_config_route_v3_HedgePolicy_set_hedge_on_per_try_timeout(envoy_config_route_v3_HedgePolicy *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RedirectAction */ @@ -7112,39 +7156,39 @@ UPB_INLINE bool envoy_config_route_v3_RedirectAction_has_regex_rewrite(const env UPB_INLINE void envoy_config_route_v3_RedirectAction_set_host_redirect(envoy_config_route_v3_RedirectAction *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(44, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_path_redirect(envoy_config_route_v3_RedirectAction *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 48), -25, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_response_code(envoy_config_route_v3_RedirectAction *msg, int32_t value) { const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_https_redirect(envoy_config_route_v3_RedirectAction *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(28, 32), -17, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_prefix_rewrite(envoy_config_route_v3_RedirectAction *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(36, 48), -25, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_strip_query(envoy_config_route_v3_RedirectAction *msg, bool value) { const upb_MiniTableField field = {6, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_scheme_redirect(envoy_config_route_v3_RedirectAction *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 32), -17, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_port_redirect(envoy_config_route_v3_RedirectAction *msg, uint32_t value) { const upb_MiniTableField field = {8, 20, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {9, UPB_SIZE(36, 48), -25, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -7222,11 +7266,11 @@ UPB_INLINE bool envoy_config_route_v3_DirectResponseAction_has_body(const envoy_ UPB_INLINE void envoy_config_route_v3_DirectResponseAction_set_status(envoy_config_route_v3_DirectResponseAction *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_DirectResponseAction_set_body(envoy_config_route_v3_DirectResponseAction *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_route_v3_DirectResponseAction_mutable_body(envoy_config_route_v3_DirectResponseAction* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_route_v3_DirectResponseAction_body(msg); @@ -7342,11 +7386,11 @@ UPB_INLINE bool envoy_config_route_v3_Decorator_has_propagate(const envoy_config UPB_INLINE void envoy_config_route_v3_Decorator_set_operation(envoy_config_route_v3_Decorator *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_Decorator_set_propagate(envoy_config_route_v3_Decorator *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_Decorator_mutable_propagate(envoy_config_route_v3_Decorator* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_Decorator_propagate(msg); @@ -7476,7 +7520,7 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_Tracing_custom_tags_mutable_upb_arr UPB_INLINE void envoy_config_route_v3_Tracing_set_client_sampling(envoy_config_route_v3_Tracing *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_client_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_client_sampling(msg); @@ -7488,7 +7532,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing } UPB_INLINE void envoy_config_route_v3_Tracing_set_random_sampling(envoy_config_route_v3_Tracing *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_random_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_random_sampling(msg); @@ -7500,7 +7544,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing } UPB_INLINE void envoy_config_route_v3_Tracing_set_overall_sampling(envoy_config_route_v3_Tracing *msg, struct envoy_type_v3_FractionalPercent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_config_route_v3_Tracing_mutable_overall_sampling(envoy_config_route_v3_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_config_route_v3_Tracing_overall_sampling(msg); @@ -7624,7 +7668,7 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_VirtualCluster_headers_mutable_upb_ UPB_INLINE void envoy_config_route_v3_VirtualCluster_set_name(envoy_config_route_v3_VirtualCluster *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_HeaderMatcher** envoy_config_route_v3_VirtualCluster_mutable_headers(envoy_config_route_v3_VirtualCluster* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -7772,7 +7816,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_has_limit(const envoy_config_rou UPB_INLINE void envoy_config_route_v3_RateLimit_set_stage(envoy_config_route_v3_RateLimit *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_mutable_stage(envoy_config_route_v3_RateLimit* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_stage(msg); @@ -7784,7 +7828,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_m } UPB_INLINE void envoy_config_route_v3_RateLimit_set_disable_key(envoy_config_route_v3_RateLimit *msg, upb_StringView value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_route_v3_RateLimit_Action** envoy_config_route_v3_RateLimit_mutable_actions(envoy_config_route_v3_RateLimit* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -7818,7 +7862,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action* envoy_config_route_v3_ } UPB_INLINE void envoy_config_route_v3_RateLimit_set_limit(envoy_config_route_v3_RateLimit *msg, envoy_config_route_v3_RateLimit_Override* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Override* envoy_config_route_v3_RateLimit_mutable_limit(envoy_config_route_v3_RateLimit* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Override* sub = (struct envoy_config_route_v3_RateLimit_Override*)envoy_config_route_v3_RateLimit_limit(msg); @@ -8063,7 +8107,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_has_query_parameter_value 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_config_route_v3_RateLimit_Action_mutable_source_cluster(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_SourceCluster* sub = (struct envoy_config_route_v3_RateLimit_Action_SourceCluster*)envoy_config_route_v3_RateLimit_Action_source_cluster(msg); @@ -8075,7 +8119,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_SourceCluster* envoy_co } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_destination_cluster(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_DestinationCluster* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DestinationCluster* envoy_config_route_v3_RateLimit_Action_mutable_destination_cluster(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_DestinationCluster* sub = (struct envoy_config_route_v3_RateLimit_Action_DestinationCluster*)envoy_config_route_v3_RateLimit_Action_destination_cluster(msg); @@ -8087,7 +8131,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DestinationCluster* env } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_request_headers(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_RequestHeaders* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_config_route_v3_RateLimit_Action_mutable_request_headers(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_RequestHeaders* sub = (struct envoy_config_route_v3_RateLimit_Action_RequestHeaders*)envoy_config_route_v3_RateLimit_Action_request_headers(msg); @@ -8099,7 +8143,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RequestHeaders* envoy_c } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_remote_address(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_RemoteAddress* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_config_route_v3_RateLimit_Action_mutable_remote_address(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_RemoteAddress* sub = (struct envoy_config_route_v3_RateLimit_Action_RemoteAddress*)envoy_config_route_v3_RateLimit_Action_remote_address(msg); @@ -8111,7 +8155,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_RemoteAddress* envoy_co } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_generic_key(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_GenericKey* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_config_route_v3_RateLimit_Action_mutable_generic_key(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_GenericKey* sub = (struct envoy_config_route_v3_RateLimit_Action_GenericKey*)envoy_config_route_v3_RateLimit_Action_generic_key(msg); @@ -8123,7 +8167,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_GenericKey* envoy_confi } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_header_value_match(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_config_route_v3_RateLimit_Action_mutable_header_value_match(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* sub = (struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch*)envoy_config_route_v3_RateLimit_Action_header_value_match(msg); @@ -8135,7 +8179,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_dynamic_metadata(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_DynamicMetaData* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_config_route_v3_RateLimit_Action_mutable_dynamic_metadata(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* sub = (struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData*)envoy_config_route_v3_RateLimit_Action_dynamic_metadata(msg); @@ -8147,7 +8191,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_ } 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) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -8159,7 +8203,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_ } 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) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -8171,7 +8215,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_masked_remote_address(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* envoy_config_route_v3_RateLimit_Action_mutable_masked_remote_address(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* sub = (struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress*)envoy_config_route_v3_RateLimit_Action_masked_remote_address(msg); @@ -8183,7 +8227,7 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* en } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_query_parameter_value_match(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* envoy_config_route_v3_RateLimit_Action_mutable_query_parameter_value_match(envoy_config_route_v3_RateLimit_Action* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* sub = (struct envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch*)envoy_config_route_v3_RateLimit_Action_query_parameter_value_match(msg); @@ -8345,15 +8389,15 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_RequestHeaders_skip_if_ab UPB_INLINE void envoy_config_route_v3_RateLimit_Action_RequestHeaders_set_header_name(envoy_config_route_v3_RateLimit_Action_RequestHeaders *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_RequestHeaders_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_RequestHeaders *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_RequestHeaders_set_skip_if_absent(envoy_config_route_v3_RateLimit_Action_RequestHeaders *msg, bool value) { const upb_MiniTableField field = {3, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.RemoteAddress */ @@ -8465,7 +8509,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_has_v UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_set_v4_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_mutable_v4_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_v4_prefix_mask_len(msg); @@ -8477,7 +8521,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_A } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_set_v6_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_mutable_v6_prefix_mask_len(envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_v6_prefix_mask_len(msg); @@ -8551,11 +8595,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RateLimit_Action_GenericKey_desc UPB_INLINE void envoy_config_route_v3_RateLimit_Action_GenericKey_set_descriptor_value(envoy_config_route_v3_RateLimit_Action_GenericKey *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_GenericKey_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_GenericKey *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.HeaderValueMatch */ @@ -8669,11 +8713,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RateLimit_Action_HeaderValueMatc UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_descriptor_value(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_expect_match(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_mutable_expect_match(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_expect_match(msg); @@ -8715,7 +8759,7 @@ UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_config_route_v3_Rat } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_HeaderValueMatch *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.DynamicMetaData */ @@ -8797,11 +8841,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RateLimit_Action_DynamicMetaData UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_DynamicMetaData *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_metadata_key(envoy_config_route_v3_RateLimit_Action_DynamicMetaData *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Action_DynamicMetaData_mutable_metadata_key(envoy_config_route_v3_RateLimit_Action_DynamicMetaData* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Action_DynamicMetaData_metadata_key(msg); @@ -8813,7 +8857,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_Rate } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_default_value(envoy_config_route_v3_RateLimit_Action_DynamicMetaData *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.MetaData */ @@ -8919,11 +8963,11 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_MetaData_skip_if_absent(c UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_StringView value) { const upb_MiniTableField field = {1, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {2, UPB_SIZE(12, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -8935,15 +8979,15 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_Rate } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_default_value(envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_source(envoy_config_route_v3_RateLimit_Action_MetaData *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_skip_if_absent(envoy_config_route_v3_RateLimit_Action_MetaData *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch */ @@ -9057,11 +9101,11 @@ UPB_INLINE upb_StringView envoy_config_route_v3_RateLimit_Action_QueryParameterV UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_set_descriptor_value(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_set_expect_match(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_mutable_expect_match(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_expect_match(msg); @@ -9103,7 +9147,7 @@ UPB_INLINE struct envoy_config_route_v3_QueryParameterMatcher* envoy_config_rout } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.RateLimit.Override */ @@ -9170,7 +9214,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Override_has_dynamic_metadata(co UPB_INLINE void envoy_config_route_v3_RateLimit_Override_set_dynamic_metadata(envoy_config_route_v3_RateLimit_Override *msg, envoy_config_route_v3_RateLimit_Override_DynamicMetadata* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata* envoy_config_route_v3_RateLimit_Override_mutable_dynamic_metadata(envoy_config_route_v3_RateLimit_Override* msg, upb_Arena* arena) { struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata* sub = (struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata*)envoy_config_route_v3_RateLimit_Override_dynamic_metadata(msg); @@ -9236,7 +9280,7 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Override_DynamicMetadata_has_met UPB_INLINE void envoy_config_route_v3_RateLimit_Override_DynamicMetadata_set_metadata_key(envoy_config_route_v3_RateLimit_Override_DynamicMetadata *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Override_DynamicMetadata_mutable_metadata_key(envoy_config_route_v3_RateLimit_Override_DynamicMetadata* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Override_DynamicMetadata_metadata_key(msg); @@ -9466,15 +9510,15 @@ UPB_INLINE bool envoy_config_route_v3_HeaderMatcher_treat_missing_header_as_empt UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_name(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_exact_match(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_range_match(envoy_config_route_v3_HeaderMatcher *msg, struct envoy_type_v3_Int64Range* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 24), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_route_v3_HeaderMatcher_mutable_range_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) { struct envoy_type_v3_Int64Range* sub = (struct envoy_type_v3_Int64Range*)envoy_config_route_v3_HeaderMatcher_range_match(msg); @@ -9486,23 +9530,23 @@ UPB_INLINE struct envoy_type_v3_Int64Range* envoy_config_route_v3_HeaderMatcher_ } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_present_match(envoy_config_route_v3_HeaderMatcher *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 24), -13, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_invert_match(envoy_config_route_v3_HeaderMatcher *msg, bool value) { const upb_MiniTableField field = {8, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_prefix_match(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_suffix_match(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_safe_regex_match(envoy_config_route_v3_HeaderMatcher *msg, struct envoy_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {11, UPB_SIZE(20, 24), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_HeaderMatcher_mutable_safe_regex_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_config_route_v3_HeaderMatcher_safe_regex_match(msg); @@ -9514,11 +9558,11 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_config_route_v3_Head } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_contains_match(envoy_config_route_v3_HeaderMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(20, 24), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_string_match(envoy_config_route_v3_HeaderMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {13, UPB_SIZE(20, 24), -13, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_HeaderMatcher_mutable_string_match(envoy_config_route_v3_HeaderMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_route_v3_HeaderMatcher_string_match(msg); @@ -9530,7 +9574,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_Hea } UPB_INLINE void envoy_config_route_v3_HeaderMatcher_set_treat_missing_header_as_empty(envoy_config_route_v3_HeaderMatcher *msg, bool value) { const upb_MiniTableField field = {14, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.QueryParameterMatcher */ @@ -9626,11 +9670,11 @@ UPB_INLINE bool envoy_config_route_v3_QueryParameterMatcher_has_present_match(co UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_name(envoy_config_route_v3_QueryParameterMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_string_match(envoy_config_route_v3_QueryParameterMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_QueryParameterMatcher_mutable_string_match(envoy_config_route_v3_QueryParameterMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_route_v3_QueryParameterMatcher_string_match(msg); @@ -9642,7 +9686,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_route_v3_Que } UPB_INLINE void envoy_config_route_v3_QueryParameterMatcher_set_present_match(envoy_config_route_v3_QueryParameterMatcher *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 32), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.route.v3.InternalRedirectPolicy */ @@ -9808,7 +9852,7 @@ UPB_INLINE upb_Array* _envoy_config_route_v3_InternalRedirectPolicy_response_hea UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_set_max_internal_redirects(envoy_config_route_v3_InternalRedirectPolicy *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_InternalRedirectPolicy_mutable_max_internal_redirects(envoy_config_route_v3_InternalRedirectPolicy* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_InternalRedirectPolicy_max_internal_redirects(msg); @@ -9878,7 +9922,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_ } UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_set_allow_cross_scheme_redirect(envoy_config_route_v3_InternalRedirectPolicy *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_config_route_v3_InternalRedirectPolicy_mutable_response_headers_to_copy(envoy_config_route_v3_InternalRedirectPolicy* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(28, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -9988,7 +10032,7 @@ UPB_INLINE bool envoy_config_route_v3_FilterConfig_disabled(const envoy_config_r UPB_INLINE void envoy_config_route_v3_FilterConfig_set_config(envoy_config_route_v3_FilterConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -10000,11 +10044,11 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterConfig_mutabl } UPB_INLINE void envoy_config_route_v3_FilterConfig_set_is_optional(envoy_config_route_v3_FilterConfig *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_FilterConfig_set_disabled(envoy_config_route_v3_FilterConfig *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(17, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c index 36a7112dde..c199b0c396 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.c @@ -78,6 +78,9 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init = { &envoy_config_route_v3_VirtualHost_submsgs[0], &envoy_config_route_v3_VirtualHost__fields[0], UPB_SIZE(104, 176), 22, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.VirtualHost", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -127,6 +130,9 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigE &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.VirtualHost.TypedPerFilterConfigEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -145,6 +151,9 @@ const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init = { &envoy_config_route_v3_FilterAction_submsgs[0], &envoy_config_route_v3_FilterAction__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.FilterAction", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_RouteList_submsgs[1] = { @@ -159,6 +168,9 @@ const upb_MiniTable envoy__config__route__v3__RouteList_msg_init = { &envoy_config_route_v3_RouteList_submsgs[0], &envoy_config_route_v3_RouteList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max192b}, @@ -205,6 +217,9 @@ const upb_MiniTable envoy__config__route__v3__Route_msg_init = { &envoy_config_route_v3_Route_submsgs[0], &envoy_config_route_v3_Route__fields[0], UPB_SIZE(80, 136), 17, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Route", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -254,6 +269,9 @@ const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_m &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_Route_TypedPerFilterConfigEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Route.TypedPerFilterConfigEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -276,6 +294,9 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init = { &envoy_config_route_v3_WeightedCluster_submsgs[0], &envoy_config_route_v3_WeightedCluster__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.WeightedCluster", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_prm_1bt_max128b}, @@ -313,6 +334,9 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg &envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[0], &envoy_config_route_v3_WeightedCluster_ClusterWeight__fields[0], UPB_SIZE(72, 120), 10, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.WeightedCluster.ClusterWeight", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -346,6 +370,9 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__Ty &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[0], &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.WeightedCluster.ClusterWeight.TypedPerFilterConfigEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -365,6 +392,9 @@ const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init = &envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[0], &envoy_config_route_v3_ClusterSpecifierPlugin__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.ClusterSpecifierPlugin", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -406,6 +436,9 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch_msg_init = { &envoy_config_route_v3_RouteMatch_submsgs[0], &envoy_config_route_v3_RouteMatch__fields[0], UPB_SIZE(56, 88), 13, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pos_1bt}, @@ -430,6 +463,9 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_ NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteMatch.GrpcRouteMatchOptions", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[2] = { @@ -446,38 +482,49 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__TlsContextMatchOptions &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[0], &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteMatch.TlsContextMatchOptions", +#endif }; const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteMatch.ConnectMatcher", +#endif }; -static const upb_MiniTableSub envoy_config_route_v3_CorsPolicy_submsgs[5] = { +static const upb_MiniTableSub envoy_config_route_v3_CorsPolicy_submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, }; -static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[9] = { - {2, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(52, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {5, UPB_SIZE(60, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[10] = { + {2, UPB_SIZE(40, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(48, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(56, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {5, 64, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(12, 80), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {9, UPB_SIZE(32, 112), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {9, UPB_SIZE(36, 120), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {10, UPB_SIZE(20, 88), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {11, UPB_SIZE(24, 96), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {12, UPB_SIZE(28, 104), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {13, UPB_SIZE(32, 112), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = { &envoy_config_route_v3_CorsPolicy_submsgs[0], &envoy_config_route_v3_CorsPolicy__fields[0], - UPB_SIZE(72, 120), 9, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(72, 128), 10, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.CorsPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -488,7 +535,7 @@ const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0070000c0901004a, &upb_pom_1bt_maxmaxb}, + {0x0078000c0901004a, &upb_pom_1bt_maxmaxb}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x006000003f03005a, &upb_prm_1bt_maxmaxb}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -566,6 +613,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init = { &envoy_config_route_v3_RouteAction_submsgs[0], &envoy_config_route_v3_RouteAction__fields[0], UPB_SIZE(144, 248), 34, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x003800200100000a, &upb_pos_1bt}, @@ -607,17 +657,21 @@ static const upb_MiniTableSub envoy_config_route_v3_RouteAction_RequestMirrorPol {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, }; -static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[4] = { - {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[5] = { + {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {5, UPB_SIZE(28, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init = { &envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[0], &envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[0], - UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.RequestMirrorPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -625,7 +679,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_m {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x003000003f00002a, &upb_pss_1bt}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x000900003f000030, &upb_psb1_1bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -651,6 +705,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init = &envoy_config_route_v3_RouteAction_HashPolicy_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy__fields[0], 24, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pom_1bt_max64b}, @@ -676,6 +733,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Header_ms &envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy_Header__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.Header", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -691,6 +751,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__CookieAtt NULL, &envoy_config_route_v3_RouteAction_HashPolicy_CookieAttribute__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.CookieAttribute", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -715,6 +778,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Cookie_ms &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[0], &envoy_config_route_v3_RouteAction_HashPolicy_Cookie__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.Cookie", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -735,6 +801,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Connectio NULL, &envoy_config_route_v3_RouteAction_HashPolicy_ConnectionProperties__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.ConnectionProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -749,6 +818,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__QueryPara NULL, &envoy_config_route_v3_RouteAction_HashPolicy_QueryParameter__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.QueryParameter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -763,6 +835,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__FilterSta NULL, &envoy_config_route_v3_RouteAction_HashPolicy_FilterState__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.HashPolicy.FilterState", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -784,6 +859,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_ini &envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[0], &envoy_config_route_v3_RouteAction_UpgradeConfig__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.UpgradeConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -803,6 +881,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__Connec &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[0], &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.UpgradeConfig.ConnectConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -827,6 +908,9 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg &envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[0], &envoy_config_route_v3_RouteAction_MaxStreamDuration__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RouteAction.MaxStreamDuration", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_RetryPolicy_submsgs[10] = { @@ -862,6 +946,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init = { &envoy_config_route_v3_RetryPolicy_submsgs[0], &envoy_config_route_v3_RetryPolicy__fields[0], UPB_SIZE(72, 128), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -895,6 +982,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_ini &envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryPriority__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.RetryPriority", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -916,6 +1006,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_ms &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryHostPredicate__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.RetryHostPredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -938,6 +1031,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryBackOff_msg_init &envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[0], &envoy_config_route_v3_RetryPolicy_RetryBackOff__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.RetryBackOff", +#endif }; static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_ResetHeader__fields[2] = { @@ -949,6 +1045,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init NULL, &envoy_config_route_v3_RetryPolicy_ResetHeader__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.ResetHeader", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -971,6 +1070,9 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackO &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[0], &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RetryPolicy.RateLimitedRetryBackOff", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -992,6 +1094,9 @@ const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init = { &envoy_config_route_v3_HedgePolicy_submsgs[0], &envoy_config_route_v3_HedgePolicy__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.HedgePolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1020,6 +1125,9 @@ const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init = { &envoy_config_route_v3_RedirectAction_submsgs[0], &envoy_config_route_v3_RedirectAction__fields[0], UPB_SIZE(56, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RedirectAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x004000003f00000a, &upb_pss_1bt}, @@ -1053,6 +1161,9 @@ const upb_MiniTable envoy__config__route__v3__DirectResponseAction_msg_init = { &envoy_config_route_v3_DirectResponseAction_submsgs[0], &envoy_config_route_v3_DirectResponseAction__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.DirectResponseAction", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -1063,6 +1174,9 @@ const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.NonForwardingAction", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_Decorator_submsgs[1] = { @@ -1078,6 +1192,9 @@ const upb_MiniTable envoy__config__route__v3__Decorator_msg_init = { &envoy_config_route_v3_Decorator_submsgs[0], &envoy_config_route_v3_Decorator__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Decorator", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1102,6 +1219,9 @@ const upb_MiniTable envoy__config__route__v3__Tracing_msg_init = { &envoy_config_route_v3_Tracing_submsgs[0], &envoy_config_route_v3_Tracing__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.Tracing", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1127,6 +1247,9 @@ const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init = { &envoy_config_route_v3_VirtualCluster_submsgs[0], &envoy_config_route_v3_VirtualCluster__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.VirtualCluster", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1156,6 +1279,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init = { &envoy_config_route_v3_RateLimit_submsgs[0], &envoy_config_route_v3_RateLimit__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1196,6 +1322,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action_msg_init = { &envoy_config_route_v3_RateLimit_Action_submsgs[0], &envoy_config_route_v3_RateLimit_Action__fields[0], UPB_SIZE(16, 24), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -1220,12 +1349,18 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__SourceCluster_m NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.SourceCluster", +#endif }; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.DestinationCluster", +#endif }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[3] = { @@ -1238,6 +1373,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RequestHeaders_ NULL, &envoy_config_route_v3_RateLimit_Action_RequestHeaders__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.RequestHeaders", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1250,6 +1388,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_m NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.RemoteAddress", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[2] = { @@ -1266,6 +1407,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MaskedRemoteAdd &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[0], &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.MaskedRemoteAddress", +#endif }; static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_GenericKey__fields[2] = { @@ -1277,6 +1421,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__GenericKey_msg_ NULL, &envoy_config_route_v3_RateLimit_Action_GenericKey__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.GenericKey", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -1301,6 +1448,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatc &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[0], &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.HeaderValueMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1327,6 +1477,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[0], &envoy_config_route_v3_RateLimit_Action_DynamicMetaData__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.DynamicMetaData", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1351,6 +1504,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_in &envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[0], &envoy_config_route_v3_RateLimit_Action_MetaData__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.MetaData", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -1379,6 +1535,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterV &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[0], &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Action.QueryParameterValueMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1403,6 +1562,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init = { &envoy_config_route_v3_RateLimit_Override_submsgs[0], &envoy_config_route_v3_RateLimit_Override__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Override", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -1421,6 +1583,9 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetada &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[0], &envoy_config_route_v3_RateLimit_Override_DynamicMetadata__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.RateLimit.Override.DynamicMetadata", +#endif }; static const upb_MiniTableSub envoy_config_route_v3_HeaderMatcher_submsgs[3] = { @@ -1447,6 +1612,9 @@ const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init = { &envoy_config_route_v3_HeaderMatcher_submsgs[0], &envoy_config_route_v3_HeaderMatcher__fields[0], UPB_SIZE(40, 56), 11, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.HeaderMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002800003f00000a, &upb_pss_1bt}, @@ -1481,6 +1649,9 @@ const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init = { &envoy_config_route_v3_QueryParameterMatcher_submsgs[0], &envoy_config_route_v3_QueryParameterMatcher__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.QueryParameterMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -1510,6 +1681,9 @@ const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init = &envoy_config_route_v3_InternalRedirectPolicy_submsgs[0], &envoy_config_route_v3_InternalRedirectPolicy__fields[0], UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.InternalRedirectPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -1536,6 +1710,9 @@ const upb_MiniTable envoy__config__route__v3__FilterConfig_msg_init = { &envoy_config_route_v3_FilterConfig_submsgs[0], &envoy_config_route_v3_FilterConfig__fields[0], 24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.FilterConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h index b50561505c..c64c2cf0d8 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb.h @@ -139,15 +139,15 @@ UPB_INLINE bool envoy_config_route_v3_ScopedRouteConfiguration_has_route_configu UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_name(envoy_config_route_v3_ScopedRouteConfiguration *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_route_configuration_name(envoy_config_route_v3_ScopedRouteConfiguration *msg, upb_StringView value) { const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_key(envoy_config_route_v3_ScopedRouteConfiguration *msg, envoy_config_route_v3_ScopedRouteConfiguration_Key* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_config_route_v3_ScopedRouteConfiguration_mutable_key(envoy_config_route_v3_ScopedRouteConfiguration* msg, upb_Arena* arena) { struct envoy_config_route_v3_ScopedRouteConfiguration_Key* sub = (struct envoy_config_route_v3_ScopedRouteConfiguration_Key*)envoy_config_route_v3_ScopedRouteConfiguration_key(msg); @@ -159,11 +159,11 @@ UPB_INLINE struct envoy_config_route_v3_ScopedRouteConfiguration_Key* envoy_conf } UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_on_demand(envoy_config_route_v3_ScopedRouteConfiguration *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_set_route_configuration(envoy_config_route_v3_ScopedRouteConfiguration *msg, struct envoy_config_route_v3_RouteConfiguration* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_config_route_v3_ScopedRouteConfiguration_mutable_route_configuration(envoy_config_route_v3_ScopedRouteConfiguration* msg, upb_Arena* arena) { struct envoy_config_route_v3_RouteConfiguration* sub = (struct envoy_config_route_v3_RouteConfiguration*)envoy_config_route_v3_ScopedRouteConfiguration_route_configuration(msg); @@ -338,7 +338,7 @@ UPB_INLINE bool envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_has_ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_set_string_key(envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c index 430d498e4a..b9f67e87af 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.c @@ -34,6 +34,9 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init &envoy_config_route_v3_ScopedRouteConfiguration_submsgs[0], &envoy_config_route_v3_ScopedRouteConfiguration__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.ScopedRouteConfiguration", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -58,6 +61,9 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_ &envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[0], &envoy_config_route_v3_ScopedRouteConfiguration_Key__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.ScopedRouteConfiguration.Key", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -72,6 +78,9 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key__Fra NULL, &envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment__fields[0], UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.route.v3.ScopedRouteConfiguration.Key.Fragment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h index 41b57323bb..bc779097a5 100644 --- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h +++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb.h @@ -164,7 +164,7 @@ UPB_INLINE bool envoy_config_tap_v3_TapConfig_has_match(const envoy_config_tap_v UPB_INLINE void envoy_config_tap_v3_TapConfig_set_match_config(envoy_config_tap_v3_TapConfig *msg, envoy_config_tap_v3_MatchPredicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_mutable_match_config(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) { struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)envoy_config_tap_v3_TapConfig_match_config(msg); @@ -176,7 +176,7 @@ UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_TapCon } UPB_INLINE void envoy_config_tap_v3_TapConfig_set_output_config(envoy_config_tap_v3_TapConfig *msg, envoy_config_tap_v3_OutputConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfig_mutable_output_config(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) { struct envoy_config_tap_v3_OutputConfig* sub = (struct envoy_config_tap_v3_OutputConfig*)envoy_config_tap_v3_TapConfig_output_config(msg); @@ -188,7 +188,7 @@ UPB_INLINE struct envoy_config_tap_v3_OutputConfig* envoy_config_tap_v3_TapConfi } UPB_INLINE void envoy_config_tap_v3_TapConfig_set_tap_enabled(envoy_config_tap_v3_TapConfig *msg, struct envoy_config_core_v3_RuntimeFractionalPercent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_tap_v3_TapConfig_mutable_tap_enabled(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeFractionalPercent* sub = (struct envoy_config_core_v3_RuntimeFractionalPercent*)envoy_config_tap_v3_TapConfig_tap_enabled(msg); @@ -200,7 +200,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeFractionalPercent* envoy_config_ta } UPB_INLINE void envoy_config_tap_v3_TapConfig_set_match(envoy_config_tap_v3_TapConfig *msg, struct envoy_config_common_matcher_v3_MatchPredicate* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_common_matcher_v3_MatchPredicate* envoy_config_tap_v3_TapConfig_mutable_match(envoy_config_tap_v3_TapConfig* msg, upb_Arena* arena) { struct envoy_config_common_matcher_v3_MatchPredicate* sub = (struct envoy_config_common_matcher_v3_MatchPredicate*)envoy_config_tap_v3_TapConfig_match(msg); @@ -428,7 +428,7 @@ UPB_INLINE bool envoy_config_tap_v3_MatchPredicate_has_http_response_generic_bod UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_or_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate_MatchSet* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_mutable_or_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)envoy_config_tap_v3_MatchPredicate_or_match(msg); @@ -440,7 +440,7 @@ UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_ } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_and_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate_MatchSet* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_v3_MatchPredicate_mutable_and_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_MatchPredicate_MatchSet* sub = (struct envoy_config_tap_v3_MatchPredicate_MatchSet*)envoy_config_tap_v3_MatchPredicate_and_match(msg); @@ -452,7 +452,7 @@ UPB_INLINE struct envoy_config_tap_v3_MatchPredicate_MatchSet* envoy_config_tap_ } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_not_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_MatchPredicate* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchPredicate_mutable_not_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_MatchPredicate* sub = (struct envoy_config_tap_v3_MatchPredicate*)envoy_config_tap_v3_MatchPredicate_not_match(msg); @@ -464,11 +464,11 @@ UPB_INLINE struct envoy_config_tap_v3_MatchPredicate* envoy_config_tap_v3_MatchP } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_any_match(envoy_config_tap_v3_MatchPredicate *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_headers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_headers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_request_headers_match(msg); @@ -480,7 +480,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Matc } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_trailers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_request_trailers_match(msg); @@ -492,7 +492,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Matc } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_headers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_headers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_response_headers_match(msg); @@ -504,7 +504,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Matc } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpHeadersMatch* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_trailers_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpHeadersMatch* sub = (struct envoy_config_tap_v3_HttpHeadersMatch*)envoy_config_tap_v3_MatchPredicate_http_response_trailers_match(msg); @@ -516,7 +516,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpHeadersMatch* envoy_config_tap_v3_Matc } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpGenericBodyMatch* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_request_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpGenericBodyMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)envoy_config_tap_v3_MatchPredicate_http_request_generic_body_match(msg); @@ -528,7 +528,7 @@ UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_ } UPB_INLINE void envoy_config_tap_v3_MatchPredicate_set_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate *msg, envoy_config_tap_v3_HttpGenericBodyMatch* value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_HttpGenericBodyMatch* envoy_config_tap_v3_MatchPredicate_mutable_http_response_generic_body_match(envoy_config_tap_v3_MatchPredicate* msg, upb_Arena* arena) { struct envoy_config_tap_v3_HttpGenericBodyMatch* sub = (struct envoy_config_tap_v3_HttpGenericBodyMatch*)envoy_config_tap_v3_MatchPredicate_http_response_generic_body_match(msg); @@ -822,7 +822,7 @@ UPB_INLINE upb_Array* _envoy_config_tap_v3_HttpGenericBodyMatch_patterns_mutable UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_set_bytes_limit(envoy_config_tap_v3_HttpGenericBodyMatch *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch** envoy_config_tap_v3_HttpGenericBodyMatch_mutable_patterns(envoy_config_tap_v3_HttpGenericBodyMatch* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -936,11 +936,11 @@ UPB_INLINE bool envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_has_bi UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_set_string_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch_set_binary_match(envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.tap.v3.OutputConfig */ @@ -1088,7 +1088,7 @@ UPB_INLINE struct envoy_config_tap_v3_OutputSink* envoy_config_tap_v3_OutputConf } UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_mutable_max_buffered_rx_bytes(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_tap_v3_OutputConfig_max_buffered_rx_bytes(msg); @@ -1100,7 +1100,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_ } UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_mutable_max_buffered_tx_bytes(envoy_config_tap_v3_OutputConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_tap_v3_OutputConfig_max_buffered_tx_bytes(msg); @@ -1112,7 +1112,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_tap_v3_OutputConfig_ } UPB_INLINE void envoy_config_tap_v3_OutputConfig_set_streaming(envoy_config_tap_v3_OutputConfig *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.tap.v3.OutputSink */ @@ -1259,11 +1259,11 @@ UPB_INLINE bool envoy_config_tap_v3_OutputSink_has_custom_sink(const envoy_confi UPB_INLINE void envoy_config_tap_v3_OutputSink_set_format(envoy_config_tap_v3_OutputSink *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_streaming_admin(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_StreamingAdminSink* value) { const upb_MiniTableField field = {2, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_OutputSink_mutable_streaming_admin(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_tap_v3_StreamingAdminSink* sub = (struct envoy_config_tap_v3_StreamingAdminSink*)envoy_config_tap_v3_OutputSink_streaming_admin(msg); @@ -1275,7 +1275,7 @@ UPB_INLINE struct envoy_config_tap_v3_StreamingAdminSink* envoy_config_tap_v3_Ou } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_file_per_tap(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_FilePerTapSink* value) { const upb_MiniTableField field = {3, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_OutputSink_mutable_file_per_tap(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_tap_v3_FilePerTapSink* sub = (struct envoy_config_tap_v3_FilePerTapSink*)envoy_config_tap_v3_OutputSink_file_per_tap(msg); @@ -1287,7 +1287,7 @@ UPB_INLINE struct envoy_config_tap_v3_FilePerTapSink* envoy_config_tap_v3_Output } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_streaming_grpc(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_StreamingGrpcSink* value) { const upb_MiniTableField field = {4, 16, -13, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_OutputSink_mutable_streaming_grpc(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_tap_v3_StreamingGrpcSink* sub = (struct envoy_config_tap_v3_StreamingGrpcSink*)envoy_config_tap_v3_OutputSink_streaming_grpc(msg); @@ -1299,7 +1299,7 @@ UPB_INLINE struct envoy_config_tap_v3_StreamingGrpcSink* envoy_config_tap_v3_Out } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_buffered_admin(envoy_config_tap_v3_OutputSink *msg, envoy_config_tap_v3_BufferedAdminSink* value) { const upb_MiniTableField field = {5, 16, -13, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_OutputSink_mutable_buffered_admin(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_tap_v3_BufferedAdminSink* sub = (struct envoy_config_tap_v3_BufferedAdminSink*)envoy_config_tap_v3_OutputSink_buffered_admin(msg); @@ -1311,7 +1311,7 @@ UPB_INLINE struct envoy_config_tap_v3_BufferedAdminSink* envoy_config_tap_v3_Out } UPB_INLINE void envoy_config_tap_v3_OutputSink_set_custom_sink(envoy_config_tap_v3_OutputSink *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {6, 16, -13, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_tap_v3_OutputSink_mutable_custom_sink(envoy_config_tap_v3_OutputSink* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_tap_v3_OutputSink_custom_sink(msg); @@ -1427,11 +1427,11 @@ UPB_INLINE bool envoy_config_tap_v3_BufferedAdminSink_has_timeout(const envoy_co UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_max_traces(envoy_config_tap_v3_BufferedAdminSink *msg, uint64_t value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_BufferedAdminSink_set_timeout(envoy_config_tap_v3_BufferedAdminSink *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_config_tap_v3_BufferedAdminSink_mutable_timeout(envoy_config_tap_v3_BufferedAdminSink* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_tap_v3_BufferedAdminSink_timeout(msg); @@ -1493,7 +1493,7 @@ UPB_INLINE upb_StringView envoy_config_tap_v3_FilePerTapSink_path_prefix(const e UPB_INLINE void envoy_config_tap_v3_FilePerTapSink_set_path_prefix(envoy_config_tap_v3_FilePerTapSink *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.config.tap.v3.StreamingGrpcSink */ @@ -1563,11 +1563,11 @@ UPB_INLINE bool envoy_config_tap_v3_StreamingGrpcSink_has_grpc_service(const env UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_tap_id(envoy_config_tap_v3_StreamingGrpcSink *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_tap_v3_StreamingGrpcSink_set_grpc_service(envoy_config_tap_v3_StreamingGrpcSink *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_StreamingGrpcSink_mutable_grpc_service(envoy_config_tap_v3_StreamingGrpcSink* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_tap_v3_StreamingGrpcSink_grpc_service(msg); diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c index 10895584f6..47919d1629 100644 --- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.c @@ -41,6 +41,9 @@ const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = { &envoy_config_tap_v3_TapConfig_submsgs[0], &envoy_config_tap_v3_TapConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.TapConfig", +#endif }; static const upb_MiniTableSub envoy_config_tap_v3_MatchPredicate_submsgs[9] = { @@ -72,6 +75,9 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = { &envoy_config_tap_v3_MatchPredicate_submsgs[0], &envoy_config_tap_v3_MatchPredicate__fields[0], UPB_SIZE(16, 24), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.MatchPredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -104,6 +110,9 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init = &envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[0], &envoy_config_tap_v3_MatchPredicate_MatchSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.MatchPredicate.MatchSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -122,6 +131,9 @@ const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = { &envoy_config_tap_v3_HttpHeadersMatch_submsgs[0], &envoy_config_tap_v3_HttpHeadersMatch__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.HttpHeadersMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -141,6 +153,9 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init = { &envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[0], &envoy_config_tap_v3_HttpGenericBodyMatch__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.HttpGenericBodyMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -158,6 +173,9 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMat NULL, &envoy_config_tap_v3_HttpGenericBodyMatch_GenericTextMatch__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.HttpGenericBodyMatch.GenericTextMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -183,6 +201,9 @@ const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = { &envoy_config_tap_v3_OutputConfig_submsgs[0], &envoy_config_tap_v3_OutputConfig__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.OutputConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -216,6 +237,9 @@ const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init = { &envoy_config_tap_v3_OutputSink_submsgs[0], &envoy_config_tap_v3_OutputSink__fields[0], 24, 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.OutputSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -232,6 +256,9 @@ const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.StreamingAdminSink", +#endif }; static const upb_MiniTableSub envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = { @@ -247,6 +274,9 @@ const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init = { &envoy_config_tap_v3_BufferedAdminSink_submsgs[0], &envoy_config_tap_v3_BufferedAdminSink__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.BufferedAdminSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -261,6 +291,9 @@ const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init = { NULL, &envoy_config_tap_v3_FilePerTapSink__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.FilePerTapSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -280,6 +313,9 @@ const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init = { &envoy_config_tap_v3_StreamingGrpcSink_submsgs[0], &envoy_config_tap_v3_StreamingGrpcSink__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.tap.v3.StreamingGrpcSink", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h index 593fcf9ece..ffc331ed49 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb.h @@ -12,6 +12,7 @@ #include "envoy/config/trace/v3/datadog.upb_minitable.h" +#include "google/protobuf/duration.upb_minitable.h" #include "udpa/annotations/migrate.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" @@ -24,10 +25,78 @@ extern "C" { #endif +typedef struct envoy_config_trace_v3_DatadogRemoteConfig { upb_Message UPB_PRIVATE(base); } envoy_config_trace_v3_DatadogRemoteConfig; typedef struct envoy_config_trace_v3_DatadogConfig { upb_Message UPB_PRIVATE(base); } envoy_config_trace_v3_DatadogConfig; +struct google_protobuf_Duration; +/* envoy.config.trace.v3.DatadogRemoteConfig */ + +UPB_INLINE envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogRemoteConfig_new(upb_Arena* arena) { + return (envoy_config_trace_v3_DatadogRemoteConfig*)_upb_Message_New(&envoy__config__trace__v3__DatadogRemoteConfig_msg_init, arena); +} +UPB_INLINE envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogRemoteConfig_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_config_trace_v3_DatadogRemoteConfig* ret = envoy_config_trace_v3_DatadogRemoteConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogRemoteConfig_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_config_trace_v3_DatadogRemoteConfig* ret = envoy_config_trace_v3_DatadogRemoteConfig_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_config_trace_v3_DatadogRemoteConfig_serialize(const envoy_config_trace_v3_DatadogRemoteConfig* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_config_trace_v3_DatadogRemoteConfig_serialize_ex(const envoy_config_trace_v3_DatadogRemoteConfig* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_config_trace_v3_DatadogRemoteConfig_clear_polling_interval(envoy_config_trace_v3_DatadogRemoteConfig* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct google_protobuf_Duration* envoy_config_trace_v3_DatadogRemoteConfig_polling_interval(const envoy_config_trace_v3_DatadogRemoteConfig* msg) { + const struct google_protobuf_Duration* default_val = NULL; + const struct google_protobuf_Duration* ret; + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_trace_v3_DatadogRemoteConfig_has_polling_interval(const envoy_config_trace_v3_DatadogRemoteConfig* msg) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void envoy_config_trace_v3_DatadogRemoteConfig_set_polling_interval(envoy_config_trace_v3_DatadogRemoteConfig *msg, struct google_protobuf_Duration* value) { + const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_trace_v3_DatadogRemoteConfig_mutable_polling_interval(envoy_config_trace_v3_DatadogRemoteConfig* msg, upb_Arena* arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_trace_v3_DatadogRemoteConfig_polling_interval(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_Message_New(&google__protobuf__Duration_msg_init, arena); + if (sub) envoy_config_trace_v3_DatadogRemoteConfig_set_polling_interval(msg, sub); + } + return sub; +} + /* envoy.config.trace.v3.DatadogConfig */ UPB_INLINE envoy_config_trace_v3_DatadogConfig* envoy_config_trace_v3_DatadogConfig_new(upb_Arena* arena) { @@ -65,53 +134,81 @@ UPB_INLINE char* envoy_config_trace_v3_DatadogConfig_serialize_ex(const envoy_co return ptr; } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_collector_cluster(envoy_config_trace_v3_DatadogConfig* msg) { - const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_trace_v3_DatadogConfig_collector_cluster(const envoy_config_trace_v3_DatadogConfig* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_service_name(envoy_config_trace_v3_DatadogConfig* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_trace_v3_DatadogConfig_service_name(const envoy_config_trace_v3_DatadogConfig* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_collector_hostname(envoy_config_trace_v3_DatadogConfig* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_config_trace_v3_DatadogConfig_collector_hostname(const envoy_config_trace_v3_DatadogConfig* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } +UPB_INLINE void envoy_config_trace_v3_DatadogConfig_clear_remote_config(envoy_config_trace_v3_DatadogConfig* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogConfig_remote_config(const envoy_config_trace_v3_DatadogConfig* msg) { + const envoy_config_trace_v3_DatadogRemoteConfig* default_val = NULL; + const envoy_config_trace_v3_DatadogRemoteConfig* ret; + const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_config_trace_v3_DatadogConfig_has_remote_config(const envoy_config_trace_v3_DatadogConfig* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_collector_cluster(envoy_config_trace_v3_DatadogConfig *msg, upb_StringView value) { - const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_service_name(envoy_config_trace_v3_DatadogConfig *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_collector_hostname(envoy_config_trace_v3_DatadogConfig *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_config_trace_v3_DatadogConfig_set_remote_config(envoy_config_trace_v3_DatadogConfig *msg, envoy_config_trace_v3_DatadogRemoteConfig* value) { + const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_v3_DatadogConfig_mutable_remote_config(envoy_config_trace_v3_DatadogConfig* msg, upb_Arena* arena) { + struct envoy_config_trace_v3_DatadogRemoteConfig* sub = (struct envoy_config_trace_v3_DatadogRemoteConfig*)envoy_config_trace_v3_DatadogConfig_remote_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_trace_v3_DatadogRemoteConfig*)_upb_Message_New(&envoy__config__trace__v3__DatadogRemoteConfig_msg_init, arena); + if (sub) envoy_config_trace_v3_DatadogConfig_set_remote_config(msg, sub); + } + return sub; } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c index 02294ca32f..03e5cb9995 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.c @@ -8,6 +8,7 @@ #include #include "upb/generated_code_support.h" #include "envoy/config/trace/v3/datadog.upb_minitable.h" +#include "google/protobuf/duration.upb_minitable.h" #include "udpa/annotations/migrate.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" @@ -16,25 +17,51 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[3] = { - {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +static const upb_MiniTableSub envoy_config_trace_v3_DatadogRemoteConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init}, +}; + +static const upb_MiniTableField envoy_config_trace_v3_DatadogRemoteConfig__fields[1] = { + {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = { + &envoy_config_trace_v3_DatadogRemoteConfig_submsgs[0], + &envoy_config_trace_v3_DatadogRemoteConfig__fields[0], + UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.DatadogRemoteConfig", +#endif +}; + +static const upb_MiniTableSub envoy_config_trace_v3_DatadogConfig_submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init}, +}; + +static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[4] = { + {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init = { - NULL, + &envoy_config_trace_v3_DatadogConfig_submsgs[0], &envoy_config_trace_v3_DatadogConfig__fields[0], - UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.DatadogConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x000800003f00000a, &upb_pss_1bt}, - {0x001800003f000012, &upb_pss_1bt}, - {0x002800003f00001a, &upb_pss_1bt}, + {0x001000003f00000a, &upb_pss_1bt}, + {0x002000003f000012, &upb_pss_1bt}, + {0x003000003f00001a, &upb_pss_1bt}, }) }; -static const upb_MiniTable *messages_layout[1] = { +static const upb_MiniTable *messages_layout[2] = { + &envoy__config__trace__v3__DatadogRemoteConfig_msg_init, &envoy__config__trace__v3__DatadogConfig_msg_init, }; @@ -42,7 +69,7 @@ const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layout = { messages_layout, NULL, NULL, - 1, + 2, 0, 0, }; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h index 80622a1d9a..9378ae585d 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/datadog.upb_minitable.h @@ -17,6 +17,7 @@ extern "C" { #endif +extern const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init; extern const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init; extern const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h index 5cda481b4f..6ba1fcd8b6 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb.h @@ -98,11 +98,11 @@ UPB_INLINE bool envoy_config_trace_v3_DynamicOtConfig_has_config(const envoy_con UPB_INLINE void envoy_config_trace_v3_DynamicOtConfig_set_library(envoy_config_trace_v3_DynamicOtConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_DynamicOtConfig_set_config(envoy_config_trace_v3_DynamicOtConfig *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_DynamicOtConfig_mutable_config(envoy_config_trace_v3_DynamicOtConfig* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_trace_v3_DynamicOtConfig_config(msg); diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c index a67df9520d..d95d8121e7 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable envoy__config__trace__v3__DynamicOtConfig_msg_init = { &envoy_config_trace_v3_DynamicOtConfig_submsgs[0], &envoy_config_trace_v3_DynamicOtConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.DynamicOtConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h index 9d07d0efa3..9aba7b2b75 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb.h @@ -85,7 +85,7 @@ UPB_INLINE bool envoy_config_trace_v3_Tracing_has_http(const envoy_config_trace_ UPB_INLINE void envoy_config_trace_v3_Tracing_set_http(envoy_config_trace_v3_Tracing *msg, envoy_config_trace_v3_Tracing_Http* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_config_trace_v3_Tracing_mutable_http(envoy_config_trace_v3_Tracing* msg, upb_Arena* arena) { struct envoy_config_trace_v3_Tracing_Http* sub = (struct envoy_config_trace_v3_Tracing_Http*)envoy_config_trace_v3_Tracing_http(msg); @@ -172,11 +172,11 @@ UPB_INLINE bool envoy_config_trace_v3_Tracing_Http_has_typed_config(const envoy_ UPB_INLINE void envoy_config_trace_v3_Tracing_Http_set_name(envoy_config_trace_v3_Tracing_Http *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_Tracing_Http_set_typed_config(envoy_config_trace_v3_Tracing_Http *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_config_trace_v3_Tracing_Http_mutable_typed_config(envoy_config_trace_v3_Tracing_Http* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_trace_v3_Tracing_Http_typed_config(msg); diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c index 0d2b5009cb..c08fd77c02 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = { &envoy_config_trace_v3_Tracing_submsgs[0], &envoy_config_trace_v3_Tracing__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.Tracing", +#endif }; static const upb_MiniTableSub envoy_config_trace_v3_Tracing_Http_submsgs[1] = { @@ -43,6 +46,9 @@ const upb_MiniTable envoy__config__trace__v3__Tracing__Http_msg_init = { &envoy_config_trace_v3_Tracing_Http_submsgs[0], &envoy_config_trace_v3_Tracing_Http__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.Tracing.Http", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h index f31fc6a64c..18101a2c5b 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb.h @@ -149,11 +149,11 @@ UPB_INLINE bool envoy_config_trace_v3_LightstepConfig_has_access_token(const env UPB_INLINE void envoy_config_trace_v3_LightstepConfig_set_collector_cluster(envoy_config_trace_v3_LightstepConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_LightstepConfig_set_access_token_file(envoy_config_trace_v3_LightstepConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* envoy_config_trace_v3_LightstepConfig_mutable_propagation_modes(envoy_config_trace_v3_LightstepConfig* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 48), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -185,7 +185,7 @@ UPB_INLINE bool envoy_config_trace_v3_LightstepConfig_add_propagation_modes(envo } UPB_INLINE void envoy_config_trace_v3_LightstepConfig_set_access_token(envoy_config_trace_v3_LightstepConfig *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_LightstepConfig_mutable_access_token(envoy_config_trace_v3_LightstepConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_trace_v3_LightstepConfig_access_token(msg); diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c index 8dff01b7b0..b576427211 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable envoy__config__trace__v3__LightstepConfig_msg_init = { &envoy_config_trace_v3_LightstepConfig_submsgs[0], &envoy_config_trace_v3_LightstepConfig__fields[0], UPB_SIZE(40, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.LightstepConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h index c5f6a060f7..4a83d6cb05 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb.h @@ -287,7 +287,7 @@ UPB_INLINE bool envoy_config_trace_v3_OpenCensusConfig_has_ocagent_grpc_service( UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_trace_config(envoy_config_trace_v3_OpenCensusConfig *msg, struct opencensus_proto_trace_v1_TraceConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct opencensus_proto_trace_v1_TraceConfig* envoy_config_trace_v3_OpenCensusConfig_mutable_trace_config(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) { struct opencensus_proto_trace_v1_TraceConfig* sub = (struct opencensus_proto_trace_v1_TraceConfig*)envoy_config_trace_v3_OpenCensusConfig_trace_config(msg); @@ -299,23 +299,23 @@ UPB_INLINE struct opencensus_proto_trace_v1_TraceConfig* envoy_config_trace_v3_O } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stdout_exporter_enabled(envoy_config_trace_v3_OpenCensusConfig *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_exporter_enabled(envoy_config_trace_v3_OpenCensusConfig *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(17, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_project_id(envoy_config_trace_v3_OpenCensusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_zipkin_exporter_enabled(envoy_config_trace_v3_OpenCensusConfig *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(18, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_zipkin_url(envoy_config_trace_v3_OpenCensusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(48, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* envoy_config_trace_v3_OpenCensusConfig_mutable_incoming_trace_context(envoy_config_trace_v3_OpenCensusConfig* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(20, 56), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -375,19 +375,19 @@ UPB_INLINE bool envoy_config_trace_v3_OpenCensusConfig_add_outgoing_trace_contex } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_address(envoy_config_trace_v3_OpenCensusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(56, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_ocagent_exporter_enabled(envoy_config_trace_v3_OpenCensusConfig *msg, bool value) { const upb_MiniTableField field = {11, UPB_SIZE(28, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_ocagent_address(envoy_config_trace_v3_OpenCensusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(64, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_stackdriver_grpc_service(envoy_config_trace_v3_OpenCensusConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {13, UPB_SIZE(32, 104), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCensusConfig_mutable_stackdriver_grpc_service(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenCensusConfig_stackdriver_grpc_service(msg); @@ -399,7 +399,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCe } UPB_INLINE void envoy_config_trace_v3_OpenCensusConfig_set_ocagent_grpc_service(envoy_config_trace_v3_OpenCensusConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {14, UPB_SIZE(36, 112), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCensusConfig_mutable_ocagent_grpc_service(envoy_config_trace_v3_OpenCensusConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenCensusConfig_ocagent_grpc_service(msg); diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c index 961aac1a06..e65603ed9f 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.c @@ -44,6 +44,9 @@ const upb_MiniTable envoy__config__trace__v3__OpenCensusConfig_msg_init = { &envoy_config_trace_v3_OpenCensusConfig_submsgs[0], &envoy_config_trace_v3_OpenCensusConfig__fields[0], UPB_SIZE(72, 120), 13, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.OpenCensusConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h index 34b044dfbb..9a5c96a42d 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb.h @@ -163,7 +163,7 @@ UPB_INLINE bool envoy_config_trace_v3_OpenTelemetryConfig_has_sampler(const envo UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_grpc_service(envoy_config_trace_v3_OpenTelemetryConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenTelemetryConfig_mutable_grpc_service(envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_OpenTelemetryConfig_grpc_service(msg); @@ -175,11 +175,11 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenTe } UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_service_name(envoy_config_trace_v3_OpenTelemetryConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_http_service(envoy_config_trace_v3_OpenTelemetryConfig *msg, struct envoy_config_core_v3_HttpService* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpService* envoy_config_trace_v3_OpenTelemetryConfig_mutable_http_service(envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpService* sub = (struct envoy_config_core_v3_HttpService*)envoy_config_trace_v3_OpenTelemetryConfig_http_service(msg); @@ -221,7 +221,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_trace_ } UPB_INLINE void envoy_config_trace_v3_OpenTelemetryConfig_set_sampler(envoy_config_trace_v3_OpenTelemetryConfig *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_trace_v3_OpenTelemetryConfig_mutable_sampler(envoy_config_trace_v3_OpenTelemetryConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_trace_v3_OpenTelemetryConfig_sampler(msg); diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c index d956ad7816..444bd1e530 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__trace__v3__OpenTelemetryConfig_msg_init = { &envoy_config_trace_v3_OpenTelemetryConfig_submsgs[0], &envoy_config_trace_v3_OpenTelemetryConfig__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.OpenTelemetryConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h index 30db46de9d..a113d9e8a7 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb.h @@ -84,7 +84,7 @@ UPB_INLINE bool envoy_config_trace_v3_TraceServiceConfig_has_grpc_service(const UPB_INLINE void envoy_config_trace_v3_TraceServiceConfig_set_grpc_service(envoy_config_trace_v3_TraceServiceConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_TraceServiceConfig_mutable_grpc_service(envoy_config_trace_v3_TraceServiceConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_TraceServiceConfig_grpc_service(msg); diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c index 37ef6dba26..adf7dc4768 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__config__trace__v3__TraceServiceConfig_msg_init = { &envoy_config_trace_v3_TraceServiceConfig_submsgs[0], &envoy_config_trace_v3_TraceServiceConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.TraceServiceConfig", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h index 5a42fccf1d..b0a32fd324 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb.h @@ -104,7 +104,7 @@ UPB_INLINE bool envoy_config_trace_v3_SkyWalkingConfig_has_client_config(const e UPB_INLINE void envoy_config_trace_v3_SkyWalkingConfig_set_grpc_service(envoy_config_trace_v3_SkyWalkingConfig *msg, struct envoy_config_core_v3_GrpcService* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_SkyWalkingConfig_mutable_grpc_service(envoy_config_trace_v3_SkyWalkingConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_GrpcService* sub = (struct envoy_config_core_v3_GrpcService*)envoy_config_trace_v3_SkyWalkingConfig_grpc_service(msg); @@ -116,7 +116,7 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_SkyWal } UPB_INLINE void envoy_config_trace_v3_SkyWalkingConfig_set_client_config(envoy_config_trace_v3_SkyWalkingConfig *msg, envoy_config_trace_v3_ClientConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_ClientConfig* envoy_config_trace_v3_SkyWalkingConfig_mutable_client_config(envoy_config_trace_v3_SkyWalkingConfig* msg, upb_Arena* arena) { struct envoy_config_trace_v3_ClientConfig* sub = (struct envoy_config_trace_v3_ClientConfig*)envoy_config_trace_v3_SkyWalkingConfig_client_config(msg); @@ -231,19 +231,19 @@ UPB_INLINE bool envoy_config_trace_v3_ClientConfig_has_max_cache_size(const envo UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_service_name(envoy_config_trace_v3_ClientConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_instance_name(envoy_config_trace_v3_ClientConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(36, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_backend_token(envoy_config_trace_v3_ClientConfig *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ClientConfig_set_max_cache_size(envoy_config_trace_v3_ClientConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_trace_v3_ClientConfig_mutable_max_cache_size(envoy_config_trace_v3_ClientConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_trace_v3_ClientConfig_max_cache_size(msg); diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c index 1f4cd9e40f..6d84e720d8 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init = { &envoy_config_trace_v3_SkyWalkingConfig_submsgs[0], &envoy_config_trace_v3_SkyWalkingConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.SkyWalkingConfig", +#endif }; static const upb_MiniTableSub envoy_config_trace_v3_ClientConfig_submsgs[1] = { @@ -49,6 +52,9 @@ const upb_MiniTable envoy__config__trace__v3__ClientConfig_msg_init = { &envoy_config_trace_v3_ClientConfig_submsgs[0], &envoy_config_trace_v3_ClientConfig__fields[0], UPB_SIZE(48, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.ClientConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h index 2c18ac8663..a668349402 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb.h @@ -134,7 +134,7 @@ UPB_INLINE bool envoy_config_trace_v3_XRayConfig_has_segment_fields(const envoy_ UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_daemon_endpoint(envoy_config_trace_v3_XRayConfig *msg, struct envoy_config_core_v3_SocketAddress* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_trace_v3_XRayConfig_mutable_daemon_endpoint(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_SocketAddress* sub = (struct envoy_config_core_v3_SocketAddress*)envoy_config_trace_v3_XRayConfig_daemon_endpoint(msg); @@ -146,11 +146,11 @@ UPB_INLINE struct envoy_config_core_v3_SocketAddress* envoy_config_trace_v3_XRay } UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_segment_name(envoy_config_trace_v3_XRayConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_sampling_rule_manifest(envoy_config_trace_v3_XRayConfig *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_XRayConfig_mutable_sampling_rule_manifest(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_trace_v3_XRayConfig_sampling_rule_manifest(msg); @@ -162,7 +162,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_XRayCon } UPB_INLINE void envoy_config_trace_v3_XRayConfig_set_segment_fields(envoy_config_trace_v3_XRayConfig *msg, envoy_config_trace_v3_XRayConfig_SegmentFields* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_XRayConfig_SegmentFields* envoy_config_trace_v3_XRayConfig_mutable_segment_fields(envoy_config_trace_v3_XRayConfig* msg, upb_Arena* arena) { struct envoy_config_trace_v3_XRayConfig_SegmentFields* sub = (struct envoy_config_trace_v3_XRayConfig_SegmentFields*)envoy_config_trace_v3_XRayConfig_segment_fields(msg); @@ -240,11 +240,11 @@ UPB_INLINE bool envoy_config_trace_v3_XRayConfig_SegmentFields_has_aws(const env UPB_INLINE void envoy_config_trace_v3_XRayConfig_SegmentFields_set_origin(envoy_config_trace_v3_XRayConfig_SegmentFields *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_XRayConfig_SegmentFields_set_aws(envoy_config_trace_v3_XRayConfig_SegmentFields *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_XRayConfig_SegmentFields_mutable_aws(envoy_config_trace_v3_XRayConfig_SegmentFields* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_trace_v3_XRayConfig_SegmentFields_aws(msg); diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c index 30cac96327..cae473d198 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init = { &envoy_config_trace_v3_XRayConfig_submsgs[0], &envoy_config_trace_v3_XRayConfig__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.XRayConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -57,6 +60,9 @@ const upb_MiniTable envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init &envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[0], &envoy_config_trace_v3_XRayConfig_SegmentFields__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.XRayConfig.SegmentFields", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h index 07fdc17bdb..0ac4e4daea 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb.h @@ -165,19 +165,19 @@ UPB_INLINE bool envoy_config_trace_v3_ZipkinConfig_split_spans_for_request(const UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_collector_cluster(envoy_config_trace_v3_ZipkinConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 24, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_collector_endpoint(envoy_config_trace_v3_ZipkinConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_trace_id_128bit(envoy_config_trace_v3_ZipkinConfig *msg, bool value) { const upb_MiniTableField field = {3, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_shared_span_context(envoy_config_trace_v3_ZipkinConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 56), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_trace_v3_ZipkinConfig_mutable_shared_span_context(envoy_config_trace_v3_ZipkinConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_trace_v3_ZipkinConfig_shared_span_context(msg); @@ -189,15 +189,15 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_trace_v3_ZipkinConfig_ } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_collector_endpoint_version(envoy_config_trace_v3_ZipkinConfig *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_collector_hostname(envoy_config_trace_v3_ZipkinConfig *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_split_spans_for_request(envoy_config_trace_v3_ZipkinConfig *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c index 9a43e30786..36576c7d00 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__config__trace__v3__ZipkinConfig_msg_init = { &envoy_config_trace_v3_ZipkinConfig_submsgs[0], &envoy_config_trace_v3_ZipkinConfig__fields[0], UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.config.trace.v3.ZipkinConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h index 0434315f76..2fd2340611 100644 --- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h +++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb.h @@ -164,7 +164,7 @@ UPB_INLINE bool envoy_data_accesslog_v3_TCPAccessLogEntry_has_connection_propert UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_set_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry *msg, envoy_data_accesslog_v3_AccessLogCommon* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_TCPAccessLogEntry_mutable_common_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_AccessLogCommon* sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)envoy_data_accesslog_v3_TCPAccessLogEntry_common_properties(msg); @@ -176,7 +176,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_ } UPB_INLINE void envoy_data_accesslog_v3_TCPAccessLogEntry_set_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry *msg, envoy_data_accesslog_v3_ConnectionProperties* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_ConnectionProperties* envoy_data_accesslog_v3_TCPAccessLogEntry_mutable_connection_properties(envoy_data_accesslog_v3_TCPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_ConnectionProperties* sub = (struct envoy_data_accesslog_v3_ConnectionProperties*)envoy_data_accesslog_v3_TCPAccessLogEntry_connection_properties(msg); @@ -286,7 +286,7 @@ UPB_INLINE bool envoy_data_accesslog_v3_HTTPAccessLogEntry_has_response(const en UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_AccessLogCommon* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_common_properties(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_AccessLogCommon* sub = (struct envoy_data_accesslog_v3_AccessLogCommon*)envoy_data_accesslog_v3_HTTPAccessLogEntry_common_properties(msg); @@ -298,11 +298,11 @@ UPB_INLINE struct envoy_data_accesslog_v3_AccessLogCommon* envoy_data_accesslog_ } UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_protocol_version(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, int32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_request(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_HTTPRequestProperties* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_request(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_HTTPRequestProperties* sub = (struct envoy_data_accesslog_v3_HTTPRequestProperties*)envoy_data_accesslog_v3_HTTPAccessLogEntry_request(msg); @@ -314,7 +314,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_HTTPRequestProperties* envoy_data_acce } UPB_INLINE void envoy_data_accesslog_v3_HTTPAccessLogEntry_set_response(envoy_data_accesslog_v3_HTTPAccessLogEntry *msg, envoy_data_accesslog_v3_HTTPResponseProperties* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_HTTPResponseProperties* envoy_data_accesslog_v3_HTTPAccessLogEntry_mutable_response(envoy_data_accesslog_v3_HTTPAccessLogEntry* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_HTTPResponseProperties* sub = (struct envoy_data_accesslog_v3_HTTPResponseProperties*)envoy_data_accesslog_v3_HTTPAccessLogEntry_response(msg); @@ -388,11 +388,11 @@ UPB_INLINE uint64_t envoy_data_accesslog_v3_ConnectionProperties_sent_bytes(cons UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_set_received_bytes(envoy_data_accesslog_v3_ConnectionProperties *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ConnectionProperties_set_sent_bytes(envoy_data_accesslog_v3_ConnectionProperties *msg, uint64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.AccessLogCommon */ @@ -932,11 +932,11 @@ UPB_INLINE int32_t envoy_data_accesslog_v3_AccessLogCommon_access_log_type(const UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_sample_rate(envoy_data_accesslog_v3_AccessLogCommon *msg, double value) { const upb_MiniTableField field = {1, UPB_SIZE(104, 24), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_remote_address(msg); @@ -948,7 +948,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_local_address(msg); @@ -960,7 +960,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_tls_properties(envoy_data_accesslog_v3_AccessLogCommon *msg, envoy_data_accesslog_v3_TLSProperties* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3_AccessLogCommon_mutable_tls_properties(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_TLSProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties*)envoy_data_accesslog_v3_AccessLogCommon_tls_properties(msg); @@ -972,7 +972,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties* envoy_data_accesslog_v3 } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_start_time(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_data_accesslog_v3_AccessLogCommon_mutable_start_time(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_data_accesslog_v3_AccessLogCommon_start_time(msg); @@ -984,7 +984,7 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_data_accesslog_v3_AccessLogCo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_rx_byte(msg); @@ -996,7 +996,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_tx_byte(msg); @@ -1008,7 +1008,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {8, UPB_SIZE(36, 80), 70, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_upstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_tx_byte(msg); @@ -1020,7 +1020,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 71, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_upstream_rx_byte(msg); @@ -1032,7 +1032,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 96), 72, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_upstream_rx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_upstream_rx_byte(msg); @@ -1044,7 +1044,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 104), 73, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_first_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_first_downstream_tx_byte(msg); @@ -1056,7 +1056,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {12, UPB_SIZE(52, 112), 74, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_time_to_last_downstream_tx_byte(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_time_to_last_downstream_tx_byte(msg); @@ -1068,7 +1068,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {13, UPB_SIZE(56, 120), 75, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_upstream_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_upstream_remote_address(msg); @@ -1080,7 +1080,7 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {14, UPB_SIZE(60, 128), 76, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_upstream_local_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_upstream_local_address(msg); @@ -1092,11 +1092,11 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLo } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_cluster(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {15, UPB_SIZE(112, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_response_flags(envoy_data_accesslog_v3_AccessLogCommon *msg, envoy_data_accesslog_v3_ResponseFlags* value) { const upb_MiniTableField field = {16, UPB_SIZE(64, 152), 77, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3_AccessLogCommon_mutable_response_flags(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_ResponseFlags* sub = (struct envoy_data_accesslog_v3_ResponseFlags*)envoy_data_accesslog_v3_AccessLogCommon_response_flags(msg); @@ -1108,7 +1108,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags* envoy_data_accesslog_v3 } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_metadata(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {17, UPB_SIZE(68, 160), 78, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_AccessLogCommon_mutable_metadata(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_data_accesslog_v3_AccessLogCommon_metadata(msg); @@ -1120,15 +1120,15 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_data_accesslog_v3_AccessL } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {18, UPB_SIZE(120, 168), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_route_name(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {19, UPB_SIZE(128, 184), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon *msg, struct envoy_config_core_v3_Address* value) { const upb_MiniTableField field = {20, UPB_SIZE(72, 200), 79, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Address* envoy_data_accesslog_v3_AccessLogCommon_mutable_downstream_direct_remote_address(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_data_accesslog_v3_AccessLogCommon_downstream_direct_remote_address(msg); @@ -1190,7 +1190,7 @@ UPB_INLINE envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry* envoy_data_a } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_duration(envoy_data_accesslog_v3_AccessLogCommon *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {23, UPB_SIZE(84, 224), 80, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCommon_mutable_duration(envoy_data_accesslog_v3_AccessLogCommon* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_data_accesslog_v3_AccessLogCommon_duration(msg); @@ -1202,43 +1202,43 @@ UPB_INLINE struct google_protobuf_Duration* envoy_data_accesslog_v3_AccessLogCom } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_request_attempt_count(envoy_data_accesslog_v3_AccessLogCommon *msg, uint32_t value) { const upb_MiniTableField field = {24, UPB_SIZE(88, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_connection_termination_details(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {25, UPB_SIZE(136, 232), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_stream_id(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {26, UPB_SIZE(144, 248), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_intermediate_log_entry(envoy_data_accesslog_v3_AccessLogCommon *msg, bool value) { const upb_MiniTableField field = {27, UPB_SIZE(92, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_transport_failure_reason(envoy_data_accesslog_v3_AccessLogCommon *msg, upb_StringView value) { const upb_MiniTableField field = {28, UPB_SIZE(152, 264), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) { const upb_MiniTableField field = {29, UPB_SIZE(160, 280), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_downstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) { const upb_MiniTableField field = {30, UPB_SIZE(168, 288), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_wire_bytes_sent(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) { const upb_MiniTableField field = {31, UPB_SIZE(176, 296), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_upstream_wire_bytes_received(envoy_data_accesslog_v3_AccessLogCommon *msg, uint64_t value) { const upb_MiniTableField field = {32, UPB_SIZE(184, 304), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_AccessLogCommon_set_access_log_type(envoy_data_accesslog_v3_AccessLogCommon *msg, int32_t value) { const upb_MiniTableField field = {33, UPB_SIZE(96, 20), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.AccessLogCommon.FilterStateObjectsEntry */ @@ -1643,58 +1643,70 @@ UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_dns_resolution_failure(con &default_val, &ret); return ret; } +UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_clear_downstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags* msg) { + const upb_MiniTableField field = {28, UPB_SIZE(42, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_data_accesslog_v3_ResponseFlags_downstream_remote_reset(const envoy_data_accesslog_v3_ResponseFlags* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {28, UPB_SIZE(42, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_failed_local_healthcheck(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_healthy_upstream(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {2, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_request_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {3, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_local_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {4, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {5, 13, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_connection_failure(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {6, 14, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {7, 15, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_overflow(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {8, 16, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_route_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {9, 17, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_delay_injected(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {10, 18, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_fault_injected(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {11, 19, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limited(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {12, 20, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags *msg, envoy_data_accesslog_v3_ResponseFlags_Unauthorized* value) { const upb_MiniTableField field = {13, UPB_SIZE(24, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data_accesslog_v3_ResponseFlags_mutable_unauthorized_details(envoy_data_accesslog_v3_ResponseFlags* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* sub = (struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized*)envoy_data_accesslog_v3_ResponseFlags_unauthorized_details(msg); @@ -1706,59 +1718,63 @@ UPB_INLINE struct envoy_data_accesslog_v3_ResponseFlags_Unauthorized* envoy_data } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_rate_limit_service_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(28, 21), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_connection_termination(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {15, UPB_SIZE(29, 22), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_retry_limit_exceeded(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {16, UPB_SIZE(30, 23), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_stream_idle_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {17, UPB_SIZE(31, 24), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_invalid_envoy_request_headers(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {18, UPB_SIZE(32, 25), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {19, UPB_SIZE(33, 26), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_max_stream_duration_reached(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {20, UPB_SIZE(34, 27), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_response_from_cache_filter(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {21, UPB_SIZE(35, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_filter_config_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {22, UPB_SIZE(36, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_duration_timeout(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {23, UPB_SIZE(37, 30), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_upstream_protocol_error(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {24, UPB_SIZE(38, 31), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_no_cluster_found(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {25, UPB_SIZE(39, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_overload_manager(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {26, UPB_SIZE(40, 33), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_dns_resolution_failure(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { const upb_MiniTableField field = {27, UPB_SIZE(41, 34), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_set_downstream_remote_reset(envoy_data_accesslog_v3_ResponseFlags *msg, bool value) { + const upb_MiniTableField field = {28, UPB_SIZE(42, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.ResponseFlags.Unauthorized */ @@ -1812,7 +1828,7 @@ UPB_INLINE int32_t envoy_data_accesslog_v3_ResponseFlags_Unauthorized_reason(con UPB_INLINE void envoy_data_accesslog_v3_ResponseFlags_Unauthorized_set_reason(envoy_data_accesslog_v3_ResponseFlags_Unauthorized *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.TLSProperties */ @@ -1950,11 +1966,11 @@ UPB_INLINE upb_StringView envoy_data_accesslog_v3_TLSProperties_ja3_fingerprint( UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_version(envoy_data_accesslog_v3_TLSProperties *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLSProperties_mutable_tls_cipher_suite(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_TLSProperties_tls_cipher_suite(msg); @@ -1966,11 +1982,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_TLSProper } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_sni_hostname(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties *msg, envoy_data_accesslog_v3_TLSProperties_CertificateProperties* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_mutable_local_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)envoy_data_accesslog_v3_TLSProperties_local_certificate_properties(msg); @@ -1982,7 +1998,7 @@ UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* e } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties *msg, envoy_data_accesslog_v3_TLSProperties_CertificateProperties* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* envoy_data_accesslog_v3_TLSProperties_mutable_peer_certificate_properties(envoy_data_accesslog_v3_TLSProperties* msg, upb_Arena* arena) { struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* sub = (struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties*)envoy_data_accesslog_v3_TLSProperties_peer_certificate_properties(msg); @@ -1994,11 +2010,11 @@ UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties* e } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_tls_session_id(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_set_ja3_fingerprint(envoy_data_accesslog_v3_TLSProperties *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(44, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.TLSProperties.CertificateProperties */ @@ -2126,11 +2142,11 @@ UPB_INLINE struct envoy_data_accesslog_v3_TLSProperties_CertificateProperties_Su } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_set_subject(envoy_data_accesslog_v3_TLSProperties_CertificateProperties *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_set_issuer(envoy_data_accesslog_v3_TLSProperties_CertificateProperties *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName */ @@ -2214,11 +2230,11 @@ UPB_INLINE bool envoy_data_accesslog_v3_TLSProperties_CertificateProperties_Subj UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_set_uri(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName_set_dns(envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.HTTPRequestProperties */ @@ -2461,19 +2477,19 @@ UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPRequestProperties_downstream_hea UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_method(envoy_data_accesslog_v3_HTTPRequestProperties *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_scheme(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_authority(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_port(envoy_data_accesslog_v3_HTTPRequestProperties *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPRequestProperties_mutable_port(envoy_data_accesslog_v3_HTTPRequestProperties* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_HTTPRequestProperties_port(msg); @@ -2485,35 +2501,35 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPReque } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_path(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_user_agent(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(48, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_referer(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(56, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_forwarded_for(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(64, 104), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_id(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(72, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_original_path(envoy_data_accesslog_v3_HTTPRequestProperties *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(80, 136), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_headers_bytes(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) { const upb_MiniTableField field = {11, UPB_SIZE(88, 152), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_request_body_bytes(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) { const upb_MiniTableField field = {12, UPB_SIZE(96, 160), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_request_headers_clear(envoy_data_accesslog_v3_HTTPRequestProperties* msg) { const upb_MiniTableField field = {13, UPB_SIZE(20, 168), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2542,11 +2558,11 @@ UPB_INLINE envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry* en } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_upstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) { const upb_MiniTableField field = {14, UPB_SIZE(104, 176), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPRequestProperties_set_downstream_header_bytes_received(envoy_data_accesslog_v3_HTTPRequestProperties *msg, uint64_t value) { const upb_MiniTableField field = {15, UPB_SIZE(112, 184), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry */ @@ -2739,7 +2755,7 @@ UPB_INLINE uint64_t envoy_data_accesslog_v3_HTTPResponseProperties_downstream_he UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code(envoy_data_accesslog_v3_HTTPResponseProperties *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPResponseProperties_mutable_response_code(envoy_data_accesslog_v3_HTTPResponseProperties* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_data_accesslog_v3_HTTPResponseProperties_response_code(msg); @@ -2751,11 +2767,11 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_data_accesslog_v3_HTTPRespo } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_headers_bytes(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_body_bytes(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_response_headers_clear(envoy_data_accesslog_v3_HTTPResponseProperties* msg) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2809,15 +2825,15 @@ UPB_INLINE envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry* } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_response_code_details(envoy_data_accesslog_v3_HTTPResponseProperties *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_upstream_header_bytes_received(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) { const upb_MiniTableField field = {7, UPB_SIZE(48, 72), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_set_downstream_header_bytes_sent(envoy_data_accesslog_v3_HTTPResponseProperties *msg, uint64_t value) { const upb_MiniTableField field = {8, UPB_SIZE(56, 80), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry */ diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c index d3c5c2b1b9..f4aeac90a7 100644 --- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init = { &envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[0], &envoy_data_accesslog_v3_TCPAccessLogEntry__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.TCPAccessLogEntry", +#endif }; static const upb_MiniTableSub envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[3] = { @@ -55,6 +58,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init = { &envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[0], &envoy_data_accesslog_v3_HTTPAccessLogEntry__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPAccessLogEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -72,6 +78,9 @@ const upb_MiniTable envoy__data__accesslog__v3__ConnectionProperties_msg_init = NULL, &envoy_data_accesslog_v3_ConnectionProperties__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.ConnectionProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -142,6 +151,9 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init = { &envoy_data_accesslog_v3_AccessLogCommon_submsgs[0], &envoy_data_accesslog_v3_AccessLogCommon__fields[0], UPB_SIZE(192, 312), 33, kUpb_ExtMode_NonExtendable, 33, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.AccessLogCommon", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f000009, &upb_psf8_1bt}, @@ -191,6 +203,9 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__FilterStateObje &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[0], &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.AccessLogCommon.FilterStateObjectsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -206,6 +221,9 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry NULL, &envoy_data_accesslog_v3_AccessLogCommon_CustomTagsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.AccessLogCommon.CustomTagsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -218,7 +236,7 @@ static const upb_MiniTableSub envoy_data_accesslog_v3_ResponseFlags_submsgs[1] = {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init}, }; -static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[27] = { +static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[28] = { {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {3, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, @@ -246,12 +264,16 @@ static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[27 {25, UPB_SIZE(39, 32), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {26, UPB_SIZE(40, 33), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {27, UPB_SIZE(41, 34), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {28, UPB_SIZE(42, 35), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init = { &envoy_data_accesslog_v3_ResponseFlags_submsgs[0], &envoy_data_accesslog_v3_ResponseFlags__fields[0], - 48, 27, kUpb_ExtMode_NonExtendable, 27, UPB_FASTTABLE_MASK(248), 0, + 48, 28, kUpb_ExtMode_NonExtendable, 28, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.ResponseFlags", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, @@ -281,7 +303,7 @@ const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init = { {0x002000003f0001c8, &upb_psb1_2bt}, {0x002100003f0001d0, &upb_psb1_2bt}, {0x002200003f0001d8, &upb_psb1_2bt}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x002300003f0001e0, &upb_psb1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -296,6 +318,9 @@ const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_ NULL, &envoy_data_accesslog_v3_ResponseFlags_Unauthorized__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.ResponseFlags.Unauthorized", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -322,6 +347,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init = { &envoy_data_accesslog_v3_TLSProperties_submsgs[0], &envoy_data_accesslog_v3_TLSProperties__fields[0], UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.TLSProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -348,6 +376,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProper &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[0], &envoy_data_accesslog_v3_TLSProperties_CertificateProperties__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.TLSProperties.CertificateProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -365,6 +396,9 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProper NULL, &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_SubjectAltName__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.TLSProperties.CertificateProperties.SubjectAltName", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -400,6 +434,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties_msg_init = &envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[0], &envoy_data_accesslog_v3_HTTPRequestProperties__fields[0], UPB_SIZE(120, 192), 15, kUpb_ExtMode_NonExtendable, 15, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPRequestProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -429,6 +466,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties__RequestHe NULL, &envoy_data_accesslog_v3_HTTPRequestProperties_RequestHeadersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPRequestProperties.RequestHeadersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -458,6 +498,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties_msg_init &envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[0], &envoy_data_accesslog_v3_HTTPResponseProperties__fields[0], UPB_SIZE(64, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPResponseProperties", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -487,6 +530,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__Response NULL, &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseHeadersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPResponseProperties.ResponseHeadersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -504,6 +550,9 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties__Response NULL, &envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.data.accesslog.v3.HTTPResponseProperties.ResponseTrailersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c index 3d5382bd80..8f929ddb53 100644 --- a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__extensions__clusters__aggregate__v3__ClusterConfig_ms NULL, &envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.clusters.aggregate.v3.ClusterConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h index 41613aa67f..f48a3c58f4 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb.h @@ -136,7 +136,7 @@ UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_header_d 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) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -148,7 +148,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_common_faul } 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) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -160,7 +160,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_comm } 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) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -306,7 +306,7 @@ UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_head 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) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -318,7 +318,7 @@ UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedL } 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) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -330,7 +330,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_comm } 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) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -392,7 +392,7 @@ UPB_INLINE uint64_t envoy_extensions_filters_common_fault_v3_FaultRateLimit_Fixe 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) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit */ diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c index 693c0e1fc2..98bd93d83a 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay_ms &envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[0], &envoy_extensions_filters_common_fault_v3_FaultDelay__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultDelay", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -49,6 +52,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__H NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay", +#endif }; static const upb_MiniTableSub envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = { @@ -67,6 +73,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi &envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[0], &envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultRateLimit", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pom_1bt_max64b}, @@ -83,6 +92,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi NULL, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -93,6 +105,9 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimi NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit", +#endif }; static const upb_MiniTable *messages_layout[5] = { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h index 934aeab037..94cf90be88 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb.h @@ -154,11 +154,11 @@ UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_grpc_statu UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_http_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -170,7 +170,7 @@ UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http } 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) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -182,7 +182,7 @@ UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* } UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_grpc_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort */ @@ -514,7 +514,7 @@ UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_filter_meta 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -526,7 +526,7 @@ UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_ext } 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) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -538,7 +538,7 @@ UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_exten } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_upstream_cluster(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(44, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { upb_MiniTableField field = {4, UPB_SIZE(20, 48), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -600,7 +600,7 @@ UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_add_downstream_ } 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) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -612,7 +612,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fau } 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) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -624,39 +624,39 @@ UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(52, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(60, 96), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_duration_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(68, 112), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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_StringView value) { const upb_MiniTableField field = {11, UPB_SIZE(76, 128), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(84, 144), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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_StringView value) { const upb_MiniTableField field = {13, UPB_SIZE(92, 160), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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_StringView value) { const upb_MiniTableField field = {14, UPB_SIZE(100, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_disable_downstream_cluster_stats(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, bool value) { const upb_MiniTableField field = {15, UPB_SIZE(36, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {16, UPB_SIZE(40, 192), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_filter_metadata(envoy_extensions_filters_http_fault_v3_HTTPFault* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_extensions_filters_http_fault_v3_HTTPFault_filter_metadata(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c index 2c9f17db17..8b9cb2b986 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort_msg_ &envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[0], &envoy_extensions_filters_http_fault_v3_FaultAbort__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.fault.v3.FaultAbort", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -52,6 +55,9 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__Hea NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort", +#endif }; static const upb_MiniTableSub envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[6] = { @@ -86,6 +92,9 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__HTTPFault_msg_i &envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[0], &envoy_extensions_filters_http_fault_v3_HTTPFault__fields[0], UPB_SIZE(112, 200), 16, kUpb_ExtMode_NonExtendable, 16, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.fault.v3.HTTPFault", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h index 968fa258ea..3f09a91552 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb.h @@ -102,13 +102,13 @@ UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_shadow_rules(cons return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_shadow_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules_stat_prefix(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -145,10 +145,34 @@ UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_has_shadow_matcher(co const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC* msg) { + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_extensions_filters_http_rbac_v3_RBAC_rules_stat_prefix(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_clear_track_per_rule_stats(envoy_extensions_filters_http_rbac_v3_RBAC* msg) { + const upb_MiniTableField field = {7, UPB_SIZE(28, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBAC_track_per_rule_stats(const envoy_extensions_filters_http_rbac_v3_RBAC* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {7, UPB_SIZE(28, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_rules(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct envoy_config_rbac_v3_RBAC* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_RBAC* sub = (struct envoy_config_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBAC_rules(msg); @@ -160,7 +184,7 @@ UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_ } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct envoy_config_rbac_v3_RBAC* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_shadow_rules(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) { struct envoy_config_rbac_v3_RBAC* sub = (struct envoy_config_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBAC_shadow_rules(msg); @@ -171,12 +195,12 @@ UPB_INLINE struct envoy_config_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_ return sub; } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC *msg, upb_StringView value) { - const upb_MiniTableField field = {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_matcher(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_extensions_filters_http_rbac_v3_RBAC_matcher(msg); @@ -188,7 +212,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rba } UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC *msg, struct xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rbac_v3_RBAC_mutable_shadow_matcher(envoy_extensions_filters_http_rbac_v3_RBAC* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)envoy_extensions_filters_http_rbac_v3_RBAC_shadow_matcher(msg); @@ -198,6 +222,14 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher* envoy_extensions_filters_http_rba } return sub; } +UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_rules_stat_prefix(envoy_extensions_filters_http_rbac_v3_RBAC *msg, upb_StringView value) { + const upb_MiniTableField field = {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBAC_set_track_per_rule_stats(envoy_extensions_filters_http_rbac_v3_RBAC *msg, bool value) { + const upb_MiniTableField field = {7, UPB_SIZE(28, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.extensions.filters.http.rbac.v3.RBACPerRoute */ @@ -254,7 +286,7 @@ UPB_INLINE bool envoy_extensions_filters_http_rbac_v3_RBACPerRoute_has_rbac(cons UPB_INLINE void envoy_extensions_filters_http_rbac_v3_RBACPerRoute_set_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute *msg, envoy_extensions_filters_http_rbac_v3_RBAC* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_filters_http_rbac_v3_RBACPerRoute_mutable_rbac(envoy_extensions_filters_http_rbac_v3_RBACPerRoute* msg, upb_Arena* arena) { struct envoy_extensions_filters_http_rbac_v3_RBAC* sub = (struct envoy_extensions_filters_http_rbac_v3_RBAC*)envoy_extensions_filters_http_rbac_v3_RBACPerRoute_rbac(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c index 2f2dcd5ebb..279415bcf1 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.c @@ -25,23 +25,32 @@ static const upb_MiniTableSub envoy_extensions_filters_http_rbac_v3_RBAC_submsgs {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init}, }; -static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fields[5] = { +static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fields[7] = { {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {4, UPB_SIZE(20, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(24, 56), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {6, UPB_SIZE(40, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {7, UPB_SIZE(28, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBAC_msg_init = { &envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[0], &envoy_extensions_filters_http_rbac_v3_RBAC__fields[0], - UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0, + UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.rbac.v3.RBAC", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00001a, &upb_pss_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x004000003f000032, &upb_pss_1bt}, + {0x000900003f000038, &upb_psb1_1bt}, }) }; @@ -57,6 +66,9 @@ const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[0], &envoy_extensions_filters_http_rbac_v3_RBACPerRoute__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.rbac.v3.RBACPerRoute", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h index ec1f7ec36c..f5035e0e39 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb.h @@ -252,7 +252,7 @@ UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_has_upstream_log_ 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -264,7 +264,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_http_route } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_start_child_span(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -298,7 +298,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_ } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_suppress_envoy_headers(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_extensions_filters_http_router_v3_Router_mutable_strict_check_headers(envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { upb_MiniTableField field = {5, UPB_SIZE(28, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -330,11 +330,11 @@ UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_add_strict_check_ } 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) { const upb_MiniTableField field = {6, UPB_SIZE(32, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_suppress_grpc_request_failure_code_stats(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(33, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter** envoy_extensions_filters_http_router_v3_Router_mutable_upstream_http_filters(envoy_extensions_filters_http_router_v3_Router* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(36, 40), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -368,7 +368,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_upstream_log_options(envoy_extensions_filters_http_router_v3_Router *msg, envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 48), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* envoy_extensions_filters_http_router_v3_Router_mutable_upstream_log_options(envoy_extensions_filters_http_router_v3_Router* msg, upb_Arena* arena) { struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* sub = (struct envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions*)envoy_extensions_filters_http_router_v3_Router_upstream_log_options(msg); @@ -446,11 +446,11 @@ UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLog UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_set_flush_upstream_log_on_upstream_stream(envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_set_upstream_log_flush_interval(envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_mutable_upstream_log_flush_interval(envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_upstream_log_flush_interval(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c index 14ba0fcfeb..d778168144 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.c @@ -43,6 +43,9 @@ const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_ini &envoy_extensions_filters_http_router_v3_Router_submsgs[0], &envoy_extensions_filters_http_router_v3_Router__fields[0], UPB_SIZE(48, 56), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.router.v3.Router", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -76,6 +79,9 @@ const upb_MiniTable envoy__extensions__filters__http__router__v3__Router__Upstre &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[0], &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.router.v3.Router.UpstreamAccessLogOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h index 83624a21af..09b9e6aedb 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb.h @@ -96,7 +96,7 @@ UPB_INLINE bool envoy_extensions_filters_http_stateful_session_v3_StatefulSessio UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSession_set_session_state(envoy_extensions_filters_http_stateful_session_v3_StatefulSession *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_filters_http_stateful_session_v3_StatefulSession_mutable_session_state(envoy_extensions_filters_http_stateful_session_v3_StatefulSession* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_filters_http_stateful_session_v3_StatefulSession_session_state(msg); @@ -108,7 +108,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSession_set_strict(envoy_extensions_filters_http_stateful_session_v3_StatefulSession *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.http.stateful_session.v3.StatefulSessionPerRoute */ @@ -192,11 +192,11 @@ UPB_INLINE bool envoy_extensions_filters_http_stateful_session_v3_StatefulSessio UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_set_disabled(envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute *msg, bool value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_set_stateful_session(envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute *msg, envoy_extensions_filters_http_stateful_session_v3_StatefulSession* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession* envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_mutable_stateful_session(envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute* msg, upb_Arena* arena) { struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession* sub = (struct envoy_extensions_filters_http_stateful_session_v3_StatefulSession*)envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_stateful_session(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c index ec93068572..2f462758e0 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__Sta &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[0], &envoy_extensions_filters_http_stateful_session_v3_StatefulSession__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.stateful_session.v3.StatefulSession", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -49,6 +52,9 @@ const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__Sta &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[0], &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.http.stateful_session.v3.StatefulSessionPerRoute", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pob1_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h index fa8fdd11bb..7ed0360530 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h @@ -167,7 +167,7 @@ typedef enum { 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) { - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -176,7 +176,7 @@ typedef enum { 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) { - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_oneofcases)upb_Message_WhichOneofFieldNumber( UPB_UPCAST(msg), &field); } @@ -193,47 +193,47 @@ UPB_INLINE int32_t envoy_extensions_filters_network_http_connection_manager_v3_H return ret; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_stat_prefix(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(208, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(212, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stat_prefix(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {2, UPB_SIZE(208, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {2, UPB_SIZE(212, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_rds(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } 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) { const envoy_extensions_filters_network_http_connection_manager_v3_Rds* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_Rds* ret; - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } 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) { - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_route_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } 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) { const struct envoy_config_route_v3_RouteConfiguration* default_val = NULL; const struct envoy_config_route_v3_RouteConfiguration* ret; - const upb_MiniTableField field = {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } 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) { - const upb_MiniTableField field = {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_http_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { @@ -333,13 +333,13 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_server_name(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {10, UPB_SIZE(216, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {10, UPB_SIZE(220, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_server_name(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {10, UPB_SIZE(216, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {10, UPB_SIZE(220, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -501,13 +501,13 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http return ret; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_via(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {22, UPB_SIZE(224, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(228, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_via(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { upb_StringView default_val = upb_StringView_FromString(""); upb_StringView ret; - const upb_MiniTableField field = {22, UPB_SIZE(224, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {22, UPB_SIZE(228, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; @@ -641,19 +641,19 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_scoped_routes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } 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) { const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* default_val = NULL; const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* ret; - const upb_MiniTableField field = {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } 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) { - const upb_MiniTableField field = {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_preserve_external_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { @@ -797,19 +797,19 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_strip_any_host_port(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } 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) { bool default_val = false; bool ret; - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } 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) { - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_path_normalization_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { @@ -1052,18 +1052,30 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http const upb_MiniTableField field = {56, UPB_SIZE(196, 360), 90, 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_clear_append_local_overload(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { + const upb_MiniTableField field = {57, UPB_SIZE(200, 59), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_append_local_overload(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { + bool default_val = false; + bool ret; + const upb_MiniTableField field = {57, UPB_SIZE(200, 59), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} 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) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_stat_prefix(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_StringView value) { - const upb_MiniTableField field = {2, UPB_SIZE(208, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {2, UPB_SIZE(212, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { - const upb_MiniTableField field = {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -1074,8 +1086,8 @@ 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) { - const upb_MiniTableField field = {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -1117,7 +1129,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_add_user_agent(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 88), 64, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_add_user_agent(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_user_agent(msg); @@ -1129,7 +1141,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_tracing(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 96), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_tracing(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_tracing(msg); @@ -1141,7 +1153,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 104), 66, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_protocol_options(msg); @@ -1153,7 +1165,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http2_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {9, UPB_SIZE(32, 112), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http2_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http2_protocol_options(msg); @@ -1164,12 +1176,12 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_fi return sub; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_server_name(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_StringView value) { - const upb_MiniTableField field = {10, UPB_SIZE(216, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {10, UPB_SIZE(220, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_drain_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {12, UPB_SIZE(36, 136), 68, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_drain_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_drain_timeout(msg); @@ -1211,7 +1223,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_ } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_use_remote_address(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {14, UPB_SIZE(44, 152), 69, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_use_remote_address(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_use_remote_address(msg); @@ -1223,7 +1235,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_generate_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {15, UPB_SIZE(48, 160), 70, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_generate_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_generate_request_id(msg); @@ -1235,11 +1247,11 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_forward_client_cert_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, int32_t value) { const upb_MiniTableField field = {16, UPB_SIZE(52, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_set_current_client_cert_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* value) { const upb_MiniTableField field = {17, UPB_SIZE(56, 168), 71, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_set_current_client_cert_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_current_client_cert_details(msg); @@ -1251,23 +1263,23 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_proxy_100_continue(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {18, UPB_SIZE(60, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_xff_num_trusted_hops(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, uint32_t value) { const upb_MiniTableField field = {19, UPB_SIZE(64, 24), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_represent_ipv4_remote_address_as_ipv4_mapped_ipv6(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {20, UPB_SIZE(68, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_skip_xff_append(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {21, UPB_SIZE(69, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_via(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_StringView value) { - const upb_MiniTableField field = {22, UPB_SIZE(224, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {22, UPB_SIZE(228, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { upb_MiniTableField field = {23, UPB_SIZE(72, 192), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1301,7 +1313,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_stream_idle_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {24, UPB_SIZE(76, 200), 72, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_stream_idle_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_stream_idle_timeout(msg); @@ -1313,7 +1325,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_internal_address_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* value) { const upb_MiniTableField field = {25, UPB_SIZE(80, 208), 73, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_internal_address_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_internal_address_config(msg); @@ -1325,7 +1337,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_delayed_close_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {26, UPB_SIZE(84, 216), 74, 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_delayed_close_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_delayed_close_timeout(msg); @@ -1337,7 +1349,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {28, UPB_SIZE(88, 224), 75, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_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_timeout(msg); @@ -1349,7 +1361,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_max_request_headers_kb(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {29, UPB_SIZE(92, 232), 76, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_max_request_headers_kb(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_max_request_headers_kb(msg); @@ -1361,7 +1373,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_ } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_normalize_path(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {30, UPB_SIZE(96, 240), 77, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_normalize_path(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_normalize_path(msg); @@ -1372,8 +1384,8 @@ 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) { - const upb_MiniTableField field = {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -1385,19 +1397,19 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_preserve_external_request_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {32, UPB_SIZE(104, 36), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_merge_slashes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {33, UPB_SIZE(105, 37), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_server_header_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, int32_t value) { const upb_MiniTableField field = {34, UPB_SIZE(108, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_common_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_HttpProtocolOptions* value) { const upb_MiniTableField field = {35, UPB_SIZE(112, 248), 78, 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_common_http_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_common_http_protocol_options(msg); @@ -1409,7 +1421,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_fil } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_id_extension(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* value) { const upb_MiniTableField field = {36, UPB_SIZE(116, 256), 79, 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_id_extension(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_id_extension(msg); @@ -1421,11 +1433,11 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Re } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_always_set_request_id_in_response(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {37, UPB_SIZE(120, 44), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_local_reply_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* value) { const upb_MiniTableField field = {38, UPB_SIZE(124, 264), 80, 22, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_local_reply_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_local_reply_config(msg); @@ -1437,11 +1449,11 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Lo } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_strip_matching_host_port(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {39, UPB_SIZE(128, 45), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_stream_error_on_invalid_http_message(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {40, UPB_SIZE(132, 272), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_stream_error_on_invalid_http_message(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stream_error_on_invalid_http_message(msg); @@ -1453,7 +1465,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } 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) { const upb_MiniTableField field = {41, UPB_SIZE(136, 280), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1464,12 +1476,12 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt 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) { - const upb_MiniTableField field = {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_path_normalization_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* value) { const upb_MiniTableField field = {43, UPB_SIZE(144, 288), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_path_normalization_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_path_normalization_options(msg); @@ -1481,7 +1493,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_http3_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_Http3ProtocolOptions* value) { const upb_MiniTableField field = {44, UPB_SIZE(148, 296), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http3_protocol_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http3_protocol_options(msg); @@ -1493,7 +1505,7 @@ UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_path_with_escaped_slashes_action(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, int32_t value) { const upb_MiniTableField field = {45, UPB_SIZE(152, 52), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_original_ip_detection_extensions(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { upb_MiniTableField field = {46, UPB_SIZE(156, 304), 0, 27, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1527,11 +1539,11 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_strip_trailing_host_dot(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {47, UPB_SIZE(160, 56), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_scheme_header_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_SchemeHeaderTransformation* value) { const upb_MiniTableField field = {48, UPB_SIZE(164, 312), 85, 28, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SchemeHeaderTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_scheme_header_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_SchemeHeaderTransformation* sub = (struct envoy_config_core_v3_SchemeHeaderTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scheme_header_transformation(msg); @@ -1543,7 +1555,7 @@ UPB_INLINE struct envoy_config_core_v3_SchemeHeaderTransformation* envoy_extensi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_proxy_status_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* value) { const upb_MiniTableField field = {49, UPB_SIZE(168, 320), 86, 29, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_proxy_status_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_proxy_status_config(msg); @@ -1555,7 +1567,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_typed_header_validation_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {50, UPB_SIZE(172, 328), 87, 30, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_typed_header_validation_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_typed_header_validation_config(msg); @@ -1567,7 +1579,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_append_x_forwarded_port(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {51, UPB_SIZE(176, 57), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_early_header_mutation_extensions(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, size_t* size) { upb_MiniTableField field = {52, UPB_SIZE(180, 336), 0, 31, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1601,7 +1613,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_add_proxy_protocol_connection_state(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {53, UPB_SIZE(184, 344), 88, 32, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_add_proxy_protocol_connection_state(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_proxy_protocol_connection_state(msg); @@ -1613,7 +1625,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {54, UPB_SIZE(188, 352), 89, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_access_log_flush_interval(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_access_log_flush_interval(msg); @@ -1625,11 +1637,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_flush_access_log_on_new_request(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { const upb_MiniTableField field = {55, UPB_SIZE(192, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_access_log_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* value) { const upb_MiniTableField field = {56, UPB_SIZE(196, 360), 90, 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_access_log_options(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log_options(msg); @@ -1639,6 +1651,10 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } return sub; } +UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_append_local_overload(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { + const upb_MiniTableField field = {57, UPB_SIZE(200, 59), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing */ @@ -1819,7 +1835,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_client_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_client_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_client_sampling(msg); @@ -1831,7 +1847,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_c } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_random_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_random_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_random_sampling(msg); @@ -1843,7 +1859,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_c } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_overall_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_overall_sampling(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_overall_sampling(msg); @@ -1855,11 +1871,11 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_filters_network_http_c } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_verbose(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_max_path_tag_length(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_max_path_tag_length(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_max_path_tag_length(msg); @@ -1901,7 +1917,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag* envoy_extensions_filters_netw } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_provider(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct envoy_config_trace_v3_Tracing_Http* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_provider(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct envoy_config_trace_v3_Tracing_Http* sub = (struct envoy_config_trace_v3_Tracing_Http*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_provider(msg); @@ -1913,7 +1929,7 @@ UPB_INLINE struct envoy_config_trace_v3_Tracing_Http* envoy_extensions_filters_n } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_set_spawn_upstream_span(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {10, UPB_SIZE(40, 64), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_mutable_spawn_upstream_span(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_spawn_upstream_span(msg); @@ -2007,7 +2023,7 @@ UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_set_unix_sockets(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_mutable_cidr_ranges(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2143,7 +2159,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_subject(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_mutable_subject(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_subject(msg); @@ -2155,19 +2171,19 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_cert(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_dns(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(17, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_uri(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(18, 11), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_set_chain(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(19, 12), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig */ @@ -2269,7 +2285,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_set_upgrade_type(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_mutable_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2303,7 +2319,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_set_enabled(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_mutable_enabled(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_enabled(msg); @@ -2385,7 +2401,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_set_forwarding_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *msg, struct envoy_type_http_v3_PathTransformation* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_mutable_forwarding_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg, upb_Arena* arena) { struct envoy_type_http_v3_PathTransformation* sub = (struct envoy_type_http_v3_PathTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_forwarding_transformation(msg); @@ -2397,7 +2413,7 @@ UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filter } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_set_http_filter_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions *msg, struct envoy_type_http_v3_PathTransformation* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_PathTransformation* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_mutable_http_filter_transformation(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions* msg, upb_Arena* arena) { struct envoy_type_http_v3_PathTransformation* sub = (struct envoy_type_http_v3_PathTransformation*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_http_filter_transformation(msg); @@ -2537,27 +2553,27 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_remove_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_remove_connection_termination_details(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_remove_response_flags(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {3, 10, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_set_recommended_response_code(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {4, 11, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_use_node_id(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, bool value) { const upb_MiniTableField field = {5, 16, -13, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig_set_literal_proxy_name(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig *msg, upb_StringView value) { const upb_MiniTableField field = {6, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions */ @@ -2639,7 +2655,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_set_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_mutable_access_log_flush_interval(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_access_log_flush_interval(msg); @@ -2651,11 +2667,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_set_flush_access_log_on_new_request(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_set_flush_log_on_tunnel_successfully_established(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(17, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.LocalReplyConfig */ @@ -2775,7 +2791,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Re } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_set_body_format(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig *msg, struct envoy_config_core_v3_SubstitutionFormatString* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SubstitutionFormatString* envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_mutable_body_format(envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_SubstitutionFormatString* sub = (struct envoy_config_core_v3_SubstitutionFormatString*)envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_body_format(msg); @@ -2921,7 +2937,7 @@ UPB_INLINE upb_Array* _envoy_extensions_filters_network_http_connection_manager_ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_filter(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, struct envoy_config_accesslog_v3_AccessLogFilter* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_filter(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { struct envoy_config_accesslog_v3_AccessLogFilter* sub = (struct envoy_config_accesslog_v3_AccessLogFilter*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_filter(msg); @@ -2933,7 +2949,7 @@ UPB_INLINE struct envoy_config_accesslog_v3_AccessLogFilter* envoy_extensions_fi } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_status_code(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_status_code(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_status_code(msg); @@ -2945,7 +2961,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_network_ } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_body(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_body(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_body(msg); @@ -2957,7 +2973,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_filters_netw } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_set_body_format_override(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper *msg, struct envoy_config_core_v3_SubstitutionFormatString* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_SubstitutionFormatString* envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_mutable_body_format_override(envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper* msg, upb_Arena* arena) { struct envoy_config_core_v3_SubstitutionFormatString* sub = (struct envoy_config_core_v3_SubstitutionFormatString*)envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_body_format_override(msg); @@ -3065,7 +3081,7 @@ UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manag 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_Rds_mutable_config_source(envoy_extensions_filters_network_http_connection_manager_v3_Rds* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_Rds_config_source(msg); @@ -3077,7 +3093,7 @@ 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_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRouteConfigurationsList */ @@ -3305,11 +3321,11 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Scop UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_name(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scope_key_builder(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scope_key_builder(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scope_key_builder(msg); @@ -3321,7 +3337,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_rds_config_source(msg); @@ -3333,7 +3349,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_ne } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scoped_route_configurations_list(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 48), UPB_SIZE(-21, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scoped_route_configurations_list(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scoped_route_configurations_list(msg); @@ -3345,7 +3361,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Sc } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_set_scoped_rds(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 48), UPB_SIZE(-21, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_mutable_scoped_rds(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_scoped_rds(msg); @@ -3520,7 +3536,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Scop UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_set_header_value_extractor(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_mutable_header_value_extractor(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_header_value_extractor(msg); @@ -3636,19 +3652,19 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Scop UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_name(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_element_separator(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_index(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, uint32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), -9, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_set_element(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 48), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_mutable_element(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_element(msg); @@ -3722,11 +3738,11 @@ UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manag UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_set_separator(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement_set_key(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRds */ @@ -3796,7 +3812,7 @@ UPB_INLINE upb_StringView envoy_extensions_filters_network_http_connection_manag UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_set_scoped_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_mutable_scoped_rds_config_source(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_scoped_rds_config_source(msg); @@ -3808,7 +3824,7 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_ne } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_set_srds_resources_locator(envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter */ @@ -3928,11 +3944,11 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http 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_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {4, UPB_SIZE(16, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -3944,7 +3960,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_con } 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) { const upb_MiniTableField field = {5, UPB_SIZE(16, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -3956,11 +3972,11 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_extensions_f } 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) { const upb_MiniTableField field = {6, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_disabled(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, bool value) { const upb_MiniTableField field = {7, 13, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.filters.network.http_connection_manager.v3.RequestIDExtension */ @@ -4018,7 +4034,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Requ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_set_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_mutable_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_typed_config(msg); @@ -4084,7 +4100,7 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Envo UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_set_config(envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_mutable_config(envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager* msg, upb_Arena* arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager*)envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_config(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c index 57180e9d2f..a03ba035fc 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.c @@ -72,17 +72,17 @@ static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_m {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init}, }; -static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[54] = { +static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[55] = { {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, - {2, UPB_SIZE(208, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {4, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(212, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {5, UPB_SIZE(16, 80), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, UPB_SIZE(20, 88), 64, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {7, UPB_SIZE(24, 96), 65, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {8, UPB_SIZE(28, 104), 66, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {9, UPB_SIZE(32, 112), 67, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {10, UPB_SIZE(216, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {10, UPB_SIZE(220, 120), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {12, UPB_SIZE(36, 136), 68, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {13, UPB_SIZE(40, 144), 0, 8, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {14, UPB_SIZE(44, 152), 69, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection {19, UPB_SIZE(64, 24), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {20, UPB_SIZE(68, 28), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {21, UPB_SIZE(69, 29), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {22, UPB_SIZE(224, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {22, UPB_SIZE(228, 176), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {23, UPB_SIZE(72, 192), 0, 12, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {24, UPB_SIZE(76, 200), 72, 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {25, UPB_SIZE(80, 208), 73, 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -101,7 +101,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection {28, UPB_SIZE(88, 224), 75, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {29, UPB_SIZE(92, 232), 76, 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {30, UPB_SIZE(96, 240), 77, 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {31, UPB_SIZE(200, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {31, UPB_SIZE(204, 368), UPB_SIZE(-101, -33), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {32, UPB_SIZE(104, 36), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {33, UPB_SIZE(105, 37), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {34, UPB_SIZE(108, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -112,7 +112,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection {39, UPB_SIZE(128, 45), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {40, UPB_SIZE(132, 272), 81, 23, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {41, UPB_SIZE(136, 280), 82, 24, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {42, UPB_SIZE(204, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, + {42, UPB_SIZE(208, 376), UPB_SIZE(-141, -49), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {43, UPB_SIZE(144, 288), 83, 25, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {44, UPB_SIZE(148, 296), 84, 26, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {45, UPB_SIZE(152, 52), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, @@ -127,12 +127,16 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection {54, UPB_SIZE(188, 352), 89, 33, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {55, UPB_SIZE(192, 58), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {56, UPB_SIZE(196, 360), 90, 34, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {57, UPB_SIZE(200, 59), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[0], - UPB_SIZE(232, 384), 54, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(240, 384), 55, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -159,7 +163,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag {0x00b000003f0001b2, &upb_pss_2bt}, {0x00c000003f0c01ba, &upb_prm_2bt_max64b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x003b00003f0003c8, &upb_psb1_2bt}, {0x017800302a0002d0, &upb_pob1_2bt}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -194,6 +198,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__fields[0], UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -227,6 +234,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.InternalAddressConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -251,6 +261,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__fields[0], 24, 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.SetCurrentClientCertDetails", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -278,6 +291,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.UpgradeConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -300,6 +316,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.PathNormalizationOptions", +#endif }; static const upb_MiniTableField envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[6] = { @@ -315,6 +334,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag NULL, &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ProxyStatusConfig__fields[0], UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.ProxyStatusConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -341,6 +363,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__fields[0], 24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -363,6 +388,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.LocalReplyConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -389,6 +417,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__fields[0], UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ResponseMapper", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -414,6 +445,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &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, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.Rds", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -434,6 +468,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRouteConfigurationsList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -459,6 +496,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -483,6 +523,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -501,6 +544,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -522,6 +568,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -543,6 +592,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag NULL, &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_KvElement__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRoutes.ScopeKeyBuilder.FragmentBuilder.HeaderValueExtractor.KvElement", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -564,6 +616,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.ScopedRds", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -589,6 +644,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.HttpFilter", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -613,6 +671,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.RequestIDExtension", +#endif }; static const upb_MiniTableSub envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = { @@ -627,6 +688,9 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.filters.network.http_connection_manager.v3.EnvoyMobileHttpConnectionManager", +#endif }; static const upb_MiniTable *messages_layout[21] = { diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h index 87059baf18..b04c4f3694 100644 --- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h @@ -83,7 +83,7 @@ UPB_INLINE bool envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSess UPB_INLINE void envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_set_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState *msg, struct envoy_type_http_v3_Cookie* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_Cookie* envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_mutable_cookie(envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState* msg, upb_Arena* arena) { struct envoy_type_http_v3_Cookie* sub = (struct envoy_type_http_v3_Cookie*)envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_cookie(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c index 367f917e7c..5b8d30ea27 100644 --- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__extensions__http__stateful_0session__cookie__v3__Cook &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[0], &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.http.stateful_session.cookie.v3.CookieBasedSessionState", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h index e6d029c15e..c6e7a9a19f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h @@ -166,7 +166,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_client_side_weighted_ro UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_enable_oob_load_report(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_enable_oob_load_report(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_enable_oob_load_report(msg); @@ -178,7 +178,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_load_balancing_pol } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_oob_reporting_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_oob_reporting_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_oob_reporting_period(msg); @@ -190,7 +190,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_blackout_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_blackout_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_blackout_period(msg); @@ -202,7 +202,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_weight_expiration_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_weight_expiration_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_weight_expiration_period(msg); @@ -214,7 +214,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_weight_update_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_weight_update_period(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_weight_update_period(msg); @@ -226,7 +226,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_set_error_utilization_penalty(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin *msg, struct google_protobuf_FloatValue* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 69, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FloatValue* envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_mutable_error_utilization_penalty(envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin* msg, upb_Arena* arena) { struct google_protobuf_FloatValue* sub = (struct google_protobuf_FloatValue*)envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_error_utilization_penalty(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c index 79ba384fe3..14d36f8d26 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.c @@ -38,6 +38,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__client_0side_0 &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[0], &envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__fields[0], UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.client_side_weighted_round_robin.v3.ClientSideWeightedRoundRobin", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h index 25be9f4f52..e05be67fda 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb.h @@ -120,7 +120,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbCon UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig *msg, envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_mutable_zone_aware_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena) { struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_zone_aware_lb_config(msg); @@ -132,7 +132,7 @@ UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbC } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_set_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig *msg, envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_mutable_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig* msg, upb_Arena* arena) { struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_locality_weighted_lb_config(msg); @@ -226,7 +226,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_LocalityLbCon UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_mutable_routing_enabled(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_routing_enabled(msg); @@ -238,7 +238,7 @@ UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policie } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_mutable_min_cluster_size(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_min_cluster_size(msg); @@ -250,7 +250,7 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_p } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_set_fail_traffic_on_panic(envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig */ @@ -378,7 +378,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_SlowStartConf UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_slow_start_window(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_slow_start_window(msg); @@ -390,7 +390,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_load_balancing_poli } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct envoy_config_core_v3_RuntimeDouble* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_aggression(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_RuntimeDouble* sub = (struct envoy_config_core_v3_RuntimeDouble*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_aggression(msg); @@ -402,7 +402,7 @@ UPB_INLINE struct envoy_config_core_v3_RuntimeDouble* envoy_extensions_load_bala } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_set_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig *msg, struct envoy_type_v3_Percent* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_Percent* envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_mutable_min_weight_percent(envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig* msg, upb_Arena* arena) { struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_min_weight_percent(msg); @@ -480,11 +480,11 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_common_v3_ConsistentHas UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_use_hostname_for_hashing(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig *msg, bool value) { const upb_MiniTableField field = {1, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_set_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_mutable_hash_balance_factor(envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_hash_balance_factor(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c index 0d629746f0..895d12b0cd 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[0], &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -55,6 +58,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[0], &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -67,6 +73,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig", +#endif }; static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[3] = { @@ -85,6 +94,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Sl &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[0], &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig", +#endif }; static const upb_MiniTableSub envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[1] = { @@ -100,6 +112,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Co &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[0], &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000900003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h index ba22565f13..f8872c8024 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb.h @@ -76,7 +76,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst UPB_INLINE void envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst_set_shuffle_address_list(envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c index 90efd4432e..d9d62595cb 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__pick_0first__v NULL, &envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.pick_first.v3.PickFirst", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h index fd1b1a9122..622dc30b50 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h @@ -182,11 +182,11 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_h UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_hash_function(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_minimum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_minimum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_minimum_ring_size(msg); @@ -198,7 +198,7 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_p } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_maximum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct google_protobuf_UInt64Value* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_maximum_ring_size(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_maximum_ring_size(msg); @@ -210,11 +210,11 @@ UPB_INLINE struct google_protobuf_UInt64Value* envoy_extensions_load_balancing_p } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_use_hostname_for_hashing(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_hash_balance_factor(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_hash_balance_factor(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_hash_balance_factor(msg); @@ -226,7 +226,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_p } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_consistent_hashing_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 48), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_consistent_hashing_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_consistent_hashing_lb_config(msg); @@ -238,7 +238,7 @@ UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_ConsistentH } UPB_INLINE void envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_set_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash *msg, struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 56), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_mutable_locality_weighted_lb_config(envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash* msg, upb_Arena* arena) { struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig* sub = (struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig*)envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_locality_weighted_lb_config(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c index a5904caf39..2685586b5f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c @@ -39,6 +39,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__ring_0hash__v3 &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[0], &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__fields[0], UPB_SIZE(40, 64), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.ring_hash.v3.RingHash", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h index 25506249a4..808b136801 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h @@ -83,7 +83,7 @@ UPB_INLINE bool envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLoca UPB_INLINE void envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_set_endpoint_picking_policy(envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality *msg, struct envoy_config_cluster_v3_LoadBalancingPolicy* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_mutable_endpoint_picking_policy(envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality* msg, upb_Arena* arena) { struct envoy_config_cluster_v3_LoadBalancingPolicy* sub = (struct envoy_config_cluster_v3_LoadBalancingPolicy*)envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_endpoint_picking_policy(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c index 7675aefab1..249345c098 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__wrr_0locality_ &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[0], &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.load_balancing_policies.wrr_locality.v3.WrrLocality", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h index e0d3a320d2..5949405a95 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h @@ -38,6 +38,7 @@ typedef struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys { typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance; typedef struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher; typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext; +typedef struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts; struct envoy_config_core_v3_DataSource; struct envoy_config_core_v3_TypedExtensionConfig; struct envoy_config_core_v3_WatchedDirectory; @@ -56,7 +57,8 @@ typedef enum { envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_EMAIL = 1, envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_DNS = 2, envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_URI = 3, - envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_IP_ADDRESS = 4 + envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_IP_ADDRESS = 4, + envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_OTHER_NAME = 5 } envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_SanType; typedef enum { @@ -228,11 +230,11 @@ UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsParameters_s UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_set_tls_minimum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsParameters_set_tls_maximum_protocol_version(envoy_extensions_transport_sockets_tls_v3_TlsParameters *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_extensions_transport_sockets_tls_v3_TlsParameters_mutable_cipher_suites(envoy_extensions_transport_sockets_tls_v3_TlsParameters* msg, size_t* size) { upb_MiniTableField field = {3, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -407,11 +409,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_fal UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_provider_name(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_mutable_typed_config(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_typed_config(msg); @@ -423,7 +425,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_extensions_transport_sockets_tls_v3 } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_set_fallback(envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider *msg, bool value) { const upb_MiniTableField field = {4, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.transport_sockets.tls.v3.TlsCertificate */ @@ -609,7 +611,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_pkc 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_certificate_chain(msg); @@ -621,7 +623,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_private_key(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key(msg); @@ -633,7 +635,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_password(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_password(msg); @@ -645,7 +647,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_ocsp_staple(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_ocsp_staple(msg); @@ -687,7 +689,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_private_key_provider(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key_provider(msg); @@ -699,7 +701,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* } 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) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -711,7 +713,7 @@ UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transp } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 72), 70, 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_pkcs12(envoy_extensions_transport_sockets_tls_v3_TlsCertificate* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_pkcs12(msg); @@ -885,11 +887,11 @@ UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_CertificateP UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_set_instance_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance_set_certificate_name(envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher */ @@ -956,14 +958,26 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_ const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_clear_oid(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_oid(const envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_san_type(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_mutable_matcher(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_matcher(msg); @@ -973,6 +987,10 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transpor } return sub; } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_set_oid(envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher *msg, upb_StringView value) { + const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} /* envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext */ @@ -1286,10 +1304,26 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationC const upb_MiniTableField field = {16, UPB_SIZE(64, 104), 70, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_clear_system_root_certs(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) { + const upb_MiniTableField field = {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_system_root_certs(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) { + const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* default_val = NULL; + const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* ret; + const upb_MiniTableField field = {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_system_root_certs(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg) { + const upb_MiniTableField field = {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} 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) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trusted_ca(msg); @@ -1357,7 +1391,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationC } 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) { const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_require_signed_certificate_timestamp(msg); @@ -1369,7 +1403,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_ } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 56), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_crl(msg); @@ -1381,7 +1415,7 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_allow_expired_certificate(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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* size) { upb_MiniTableField field = {9, UPB_SIZE(36, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1415,11 +1449,11 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transpor } 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) { const upb_MiniTableField field = {10, UPB_SIZE(40, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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) { const upb_MiniTableField field = {11, UPB_SIZE(44, 72), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -1431,7 +1465,7 @@ UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transp } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {12, UPB_SIZE(48, 80), 68, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_custom_validator_config(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_custom_validator_config(msg); @@ -1443,7 +1477,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_tr } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* value) { const upb_MiniTableField field = {13, UPB_SIZE(52, 88), 69, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_ca_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_ca_certificate_provider_instance(msg); @@ -1455,7 +1489,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderP } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_only_verify_leaf_cert_crl(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(56, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_match_typed_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, size_t* size) { upb_MiniTableField field = {15, UPB_SIZE(60, 96), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1489,7 +1523,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatche } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {16, UPB_SIZE(64, 104), 70, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_max_verify_depth(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_max_verify_depth(msg); @@ -1499,6 +1533,56 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_socket } return sub; } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_system_root_certs(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* value) { + const upb_MiniTableField field = {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_system_root_certs(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* msg, upb_Arena* arena) { + struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_system_root_certs(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, arena); + if (sub) envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_system_root_certs(msg, sub); + } + return sub; +} + +/* envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext.SystemRootCerts */ + +UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_new(upb_Arena* arena) { + return (envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts*)_upb_Message_New(&envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, arena); +} +UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* ret = envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_serialize(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_serialize_ex(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, options, arena, &ptr, len); + return ptr; +} + #ifdef __cplusplus } /* extern "C" */ diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c index 3d40a212a1..53b28a2136 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c @@ -35,6 +35,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsParameter NULL, &envoy_extensions_transport_sockets_tls_v3_TlsParameters__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.TlsParameters", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -61,6 +64,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyPr &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.PrivateKeyProvider", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -99,6 +105,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertifica &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[0], UPB_SIZE(48, 80), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.TlsCertificate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -123,6 +132,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSessionTi &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_maxmaxb}, @@ -138,6 +150,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateP NULL, &envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CertificateProviderPluginInstance", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -150,22 +165,28 @@ static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SubjectA {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init}, }; -static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[2] = { +static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[3] = { {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init = { &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[0], - 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, + UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.SubjectAltNameMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x001800003f00001a, &upb_pss_1bt}, }) }; -static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[9] = { +static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[10] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init}, @@ -175,9 +196,10 @@ static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_Certific {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init}, + {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init}, }; -static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[14] = { +static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[15] = { {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(20, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, @@ -192,12 +214,16 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Certif {14, UPB_SIZE(56, 16), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {15, UPB_SIZE(60, 96), 0, 7, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {16, UPB_SIZE(64, 104), 70, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {17, UPB_SIZE(68, 112), 71, 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init = { &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[0], - UPB_SIZE(72, 112), 14, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, + UPB_SIZE(72, 120), 15, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -218,7 +244,16 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateV }) }; -static const upb_MiniTable *messages_layout[7] = { +const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init = { + NULL, + NULL, + 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext.SystemRootCerts", +#endif +}; + +static const upb_MiniTable *messages_layout[8] = { &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init, &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init, &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init, @@ -226,13 +261,14 @@ static const upb_MiniTable *messages_layout[7] = { &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init, &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init, &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init, + &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init, }; const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout = { messages_layout, NULL, NULL, - 7, + 8, 0, 0, }; diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h index 7ff2357258..233709125b 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.h @@ -24,6 +24,7 @@ extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSe extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init; extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init; +extern const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext__SystemRootCerts_msg_init; extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout; diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h index 8d8e75357e..ba91855976 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb.h @@ -93,7 +93,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_GenericSecret_has_secr UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_GenericSecret_set_secret(envoy_extensions_transport_sockets_tls_v3_GenericSecret *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_GenericSecret_mutable_secret(envoy_extensions_transport_sockets_tls_v3_GenericSecret* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_GenericSecret_secret(msg); @@ -171,11 +171,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_has_sd UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_name(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_sds_config(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg, struct envoy_config_core_v3_ConfigSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_mutable_sds_config(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_sds_config(msg); @@ -313,11 +313,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_Secret_has_generic_sec UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_name(envoy_extensions_transport_sockets_tls_v3_Secret *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_tls_certificate(envoy_extensions_transport_sockets_tls_v3_Secret *msg, struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_tls_certificate(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate*)envoy_extensions_transport_sockets_tls_v3_Secret_tls_certificate(msg); @@ -329,7 +329,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envo } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_Secret *msg, struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)envoy_extensions_transport_sockets_tls_v3_Secret_session_ticket_keys(msg); @@ -341,7 +341,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_validation_context(envoy_extensions_transport_sockets_tls_v3_Secret *msg, struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_validation_context(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_Secret_validation_context(msg); @@ -353,7 +353,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidatio } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_Secret_set_generic_secret(envoy_extensions_transport_sockets_tls_v3_Secret *msg, envoy_extensions_transport_sockets_tls_v3_GenericSecret* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy_extensions_transport_sockets_tls_v3_Secret_mutable_generic_secret(envoy_extensions_transport_sockets_tls_v3_Secret* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_GenericSecret* sub = (struct envoy_extensions_transport_sockets_tls_v3_GenericSecret*)envoy_extensions_transport_sockets_tls_v3_Secret_generic_secret(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c index aada248ce0..8f168e1c3e 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__GenericSecre &envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_GenericSecret__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.GenericSecret", +#endif }; static const upb_MiniTableSub envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = { @@ -46,6 +49,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretCon &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.SdsSecretConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -71,6 +77,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__Secret_msg_i &envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_Secret__fields[0], UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.Secret", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h index fb6d61b9e0..93287c34ab 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb.h @@ -168,7 +168,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_has UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_common_tls_context(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_mutable_common_tls_context(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_common_tls_context(msg); @@ -180,15 +180,15 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* en } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_sni(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_allow_renegotiation(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_max_session_keys(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_mutable_max_session_keys(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_max_session_keys(msg); @@ -200,7 +200,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_transport_socket } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_set_enforce_rsa_key_usage(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 48), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_mutable_enforce_rsa_key_usage(envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_enforce_rsa_key_usage(msg); @@ -413,7 +413,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_d UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_common_tls_context(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_common_tls_context(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_common_tls_context(msg); @@ -425,7 +425,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* en } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_require_client_certificate(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 32), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_require_client_certificate(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_require_client_certificate(msg); @@ -437,7 +437,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_ } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_require_sni(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 40), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_require_sni(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_require_sni(msg); @@ -449,7 +449,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_ } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* value) { const upb_MiniTableField field = {4, UPB_SIZE(44, 64), UPB_SIZE(-29, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_ticket_keys(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_ticket_keys(msg); @@ -461,7 +461,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_ticket_keys_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* value) { const upb_MiniTableField field = {5, UPB_SIZE(44, 64), UPB_SIZE(-29, -13), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_ticket_keys_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_ticket_keys_sds_secret_config(msg); @@ -473,7 +473,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_session_timeout(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 48), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_session_timeout(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_session_timeout(msg); @@ -485,15 +485,15 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_transport_sockets_t } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_disable_stateless_session_resumption(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(44, 64), UPB_SIZE(-29, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_ocsp_staple_policy(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, int32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_full_scan_certs_on_sni_mismatch(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, struct google_protobuf_BoolValue* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 68, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_mutable_full_scan_certs_on_sni_mismatch(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext* msg, upb_Arena* arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_full_scan_certs_on_sni_mismatch(msg); @@ -505,7 +505,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_ } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_set_disable_stateful_session_resumption(envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext *msg, bool value) { const upb_MiniTableField field = {10, UPB_SIZE(40, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.transport_sockets.tls.v3.TlsKeyLog */ @@ -623,7 +623,7 @@ UPB_INLINE upb_Array* _envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_remot UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_set_path(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(16, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_CidrRange** envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_mutable_local_address_range(envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1010,7 +1010,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_has_k UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_params(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_params(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsParameters* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsParameters*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_params(msg); @@ -1052,7 +1052,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate* envo } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* value) { const upb_MiniTableField field = {3, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context(msg); @@ -1122,7 +1122,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_sds_secret_config(msg); @@ -1134,7 +1134,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_combined_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* value) { const upb_MiniTableField field = {8, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_combined_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_combined_validation_context(msg); @@ -1146,7 +1146,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Com } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* value) { const upb_MiniTableField field = {9, UPB_SIZE(28, 48), 65, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_certificate_provider(msg); @@ -1158,7 +1158,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* value) { const upb_MiniTableField field = {10, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_certificate_provider(msg); @@ -1170,7 +1170,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* value) { const upb_MiniTableField field = {11, UPB_SIZE(32, 56), 66, 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_certificate_provider_instance(msg); @@ -1182,7 +1182,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* value) { const upb_MiniTableField field = {12, UPB_SIZE(52, 88), UPB_SIZE(-37, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_validation_context_certificate_provider_instance(msg); @@ -1194,7 +1194,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_custom_handshaker(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {13, UPB_SIZE(40, 64), 67, 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_custom_handshaker(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_custom_handshaker(msg); @@ -1206,7 +1206,7 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_tr } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_tls_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* value) { const upb_MiniTableField field = {14, UPB_SIZE(44, 72), 68, 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_tls_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_tls_certificate_provider_instance(msg); @@ -1218,7 +1218,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateProviderP } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_set_key_log(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext *msg, envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* value) { const upb_MiniTableField field = {15, UPB_SIZE(48, 80), 69, 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_mutable_key_log(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog* sub = (struct envoy_extensions_transport_sockets_tls_v3_TlsKeyLog*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_key_log(msg); @@ -1305,11 +1305,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Certi UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_set_name(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_set_typed_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_mutable_typed_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_typed_config(msg); @@ -1383,11 +1383,11 @@ UPB_INLINE upb_StringView envoy_extensions_transport_sockets_tls_v3_CommonTlsCon UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_set_instance_name(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance_set_certificate_name(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext */ @@ -1493,7 +1493,7 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Combi UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_default_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_default_validation_context(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext* sub = (struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_default_validation_context(msg); @@ -1505,7 +1505,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CertificateValidatio } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_sds_secret_config(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* sub = (struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_sds_secret_config(msg); @@ -1517,7 +1517,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig* env } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_certificate_provider(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_certificate_provider(msg); @@ -1529,7 +1529,7 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_set_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext *msg, envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_mutable_validation_context_certificate_provider_instance(envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext* msg, upb_Arena* arena) { struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* sub = (struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance*)envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_validation_context_certificate_provider_instance(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c index 9824a992a7..b8ff4989e6 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.c @@ -40,6 +40,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsC &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -75,6 +78,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTl &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__fields[0], UPB_SIZE(48, 72), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -110,6 +116,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_ms &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.TlsKeyLog", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -155,6 +164,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__fields[0], UPB_SIZE(56, 96), 14, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CommonTlsContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -188,6 +200,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProvider", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -205,6 +220,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon NULL, &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -231,6 +249,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.CommonTlsContext.CombinedCertificateValidationContext", +#endif }; static const upb_MiniTable *messages_layout[7] = { diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h index 50a753315f..a661d08ad1 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb.h @@ -196,11 +196,11 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorCon UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_set_name(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_set_trust_bundle(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain *msg, struct envoy_config_core_v3_DataSource* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_mutable_trust_bundle(envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain* msg, upb_Arena* arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_trust_bundle(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c index dbe3abba76..94fd8341dd 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertVa &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -46,6 +49,9 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertVa &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.tls.v3.SPIFFECertValidatorConfig.TrustDomain", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h index a904284b14..5869d7af4f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h @@ -218,7 +218,7 @@ UPB_INLINE bool envoy_extensions_upstreams_http_v3_HttpProtocolOptions_has_heade UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_common_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, struct envoy_config_core_v3_HttpProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_common_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_HttpProtocolOptions* sub = (struct envoy_config_core_v3_HttpProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_common_http_protocol_options(msg); @@ -230,7 +230,7 @@ UPB_INLINE struct envoy_config_core_v3_HttpProtocolOptions* envoy_extensions_ups } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_upstream_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, struct envoy_config_core_v3_UpstreamHttpProtocolOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_upstream_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_UpstreamHttpProtocolOptions* sub = (struct envoy_config_core_v3_UpstreamHttpProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_upstream_http_protocol_options(msg); @@ -242,7 +242,7 @@ UPB_INLINE struct envoy_config_core_v3_UpstreamHttpProtocolOptions* envoy_extens } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_explicit_http_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 48), UPB_SIZE(-21, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_explicit_http_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* sub = (struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_explicit_http_config(msg); @@ -254,7 +254,7 @@ UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_Explici } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_use_downstream_protocol_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(32, 48), UPB_SIZE(-21, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_use_downstream_protocol_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* sub = (struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_use_downstream_protocol_config(msg); @@ -266,7 +266,7 @@ UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDown } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_auto_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* value) { const upb_MiniTableField field = {5, UPB_SIZE(32, 48), UPB_SIZE(-21, -13), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_auto_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* sub = (struct envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_auto_config(msg); @@ -308,7 +308,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_set_header_validation_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 40), 66, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_mutable_header_validation_config(envoy_extensions_upstreams_http_v3_HttpProtocolOptions* msg, upb_Arena* arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_header_validation_config(msg); @@ -417,7 +417,7 @@ UPB_INLINE bool envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitH UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_set_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_mutable_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_http_protocol_options(msg); @@ -429,7 +429,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_set_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_mutable_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_http2_protocol_options(msg); @@ -441,7 +441,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_set_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig *msg, struct envoy_config_core_v3_Http3ProtocolOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_mutable_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_http3_protocol_options(msg); @@ -539,7 +539,7 @@ UPB_INLINE bool envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownst UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_set_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_mutable_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_http_protocol_options(msg); @@ -551,7 +551,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_set_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_mutable_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_http2_protocol_options(msg); @@ -563,7 +563,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_set_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig *msg, struct envoy_config_core_v3_Http3ProtocolOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_mutable_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_http3_protocol_options(msg); @@ -677,7 +677,7 @@ UPB_INLINE bool envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpC UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_set_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig *msg, struct envoy_config_core_v3_Http1ProtocolOptions* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_mutable_http_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http1ProtocolOptions* sub = (struct envoy_config_core_v3_Http1ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_http_protocol_options(msg); @@ -689,7 +689,7 @@ UPB_INLINE struct envoy_config_core_v3_Http1ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_set_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig *msg, struct envoy_config_core_v3_Http2ProtocolOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_mutable_http2_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http2ProtocolOptions* sub = (struct envoy_config_core_v3_Http2ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_http2_protocol_options(msg); @@ -701,7 +701,7 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_set_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig *msg, struct envoy_config_core_v3_Http3ProtocolOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_mutable_http3_protocol_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_Http3ProtocolOptions* sub = (struct envoy_config_core_v3_Http3ProtocolOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_http3_protocol_options(msg); @@ -713,7 +713,7 @@ UPB_INLINE struct envoy_config_core_v3_Http3ProtocolOptions* envoy_extensions_up } UPB_INLINE void envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_set_alternate_protocols_cache_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig *msg, struct envoy_config_core_v3_AlternateProtocolsCacheOptions* value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_AlternateProtocolsCacheOptions* envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_mutable_alternate_protocols_cache_options(envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig* msg, upb_Arena* arena) { struct envoy_config_core_v3_AlternateProtocolsCacheOptions* sub = (struct envoy_config_core_v3_AlternateProtocolsCacheOptions*)envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_alternate_protocols_cache_options(msg); diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c index bca3261db8..fde736fba2 100644 --- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.c @@ -41,6 +41,9 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_submsgs[0], &envoy_extensions_upstreams_http_v3_HttpProtocolOptions__fields[0], UPB_SIZE(40, 56), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -69,6 +72,9 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_submsgs[0], &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions.ExplicitHttpConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -93,6 +99,9 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_submsgs[0], &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions.UseDownstreamHttpConfig", +#endif }; static const upb_MiniTableSub envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[4] = { @@ -113,6 +122,9 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[0], &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.upstreams.http.v3.HttpProtocolOptions.AutoHttpConfig", +#endif }; static const upb_MiniTable *messages_layout[4] = { diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c index 882dbe5fba..375955de93 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.c @@ -19,6 +19,9 @@ const upb_MiniTable envoy__service__discovery__v3__AdsDummy_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.AdsDummy", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h index bebc961921..efc38874db 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb.h @@ -130,7 +130,7 @@ UPB_INLINE upb_Map* _envoy_service_discovery_v3_ResourceLocator_dynamic_paramete UPB_INLINE void envoy_service_discovery_v3_ResourceLocator_set_name(envoy_service_discovery_v3_ResourceLocator *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_ResourceLocator_dynamic_parameters_clear(envoy_service_discovery_v3_ResourceLocator* msg) { const upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -242,11 +242,11 @@ UPB_INLINE bool envoy_service_discovery_v3_ResourceName_has_dynamic_parameter_co UPB_INLINE void envoy_service_discovery_v3_ResourceName_set_name(envoy_service_discovery_v3_ResourceName *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_ResourceName_set_dynamic_parameter_constraints(envoy_service_discovery_v3_ResourceName *msg, envoy_service_discovery_v3_DynamicParameterConstraints* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_ResourceName_mutable_dynamic_parameter_constraints(envoy_service_discovery_v3_ResourceName* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)envoy_service_discovery_v3_ResourceName_dynamic_parameter_constraints(msg); @@ -428,11 +428,11 @@ UPB_INLINE upb_Array* _envoy_service_discovery_v3_DiscoveryRequest_resource_loca UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_version_info(envoy_service_discovery_v3_DiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_node(envoy_service_discovery_v3_DiscoveryRequest *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_discovery_v3_DiscoveryRequest_mutable_node(envoy_service_discovery_v3_DiscoveryRequest* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_discovery_v3_DiscoveryRequest_node(msg); @@ -472,15 +472,15 @@ UPB_INLINE bool envoy_service_discovery_v3_DiscoveryRequest_add_resource_names(e } UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_type_url(envoy_service_discovery_v3_DiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(36, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_response_nonce(envoy_service_discovery_v3_DiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(44, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryRequest_set_error_detail(envoy_service_discovery_v3_DiscoveryRequest *msg, struct google_rpc_Status* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 80), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DiscoveryRequest_mutable_error_detail(envoy_service_discovery_v3_DiscoveryRequest* msg, upb_Arena* arena) { struct google_rpc_Status* sub = (struct google_rpc_Status*)envoy_service_discovery_v3_DiscoveryRequest_error_detail(msg); @@ -656,7 +656,7 @@ UPB_INLINE bool envoy_service_discovery_v3_DiscoveryResponse_has_control_plane(c UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_version_info(envoy_service_discovery_v3_DiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** envoy_service_discovery_v3_DiscoveryResponse_mutable_resources(envoy_service_discovery_v3_DiscoveryResponse* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -690,19 +690,19 @@ UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_DiscoveryRespo } UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_canary(envoy_service_discovery_v3_DiscoveryResponse *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_type_url(envoy_service_discovery_v3_DiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(32, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_nonce(envoy_service_discovery_v3_DiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(40, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DiscoveryResponse_set_control_plane(envoy_service_discovery_v3_DiscoveryResponse *msg, struct envoy_config_core_v3_ControlPlane* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 72), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_DiscoveryResponse_mutable_control_plane(envoy_service_discovery_v3_DiscoveryResponse* msg, upb_Arena* arena) { struct envoy_config_core_v3_ControlPlane* sub = (struct envoy_config_core_v3_ControlPlane*)envoy_service_discovery_v3_DiscoveryResponse_control_plane(msg); @@ -965,7 +965,7 @@ UPB_INLINE upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryRequest_resource UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_node(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_node(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_discovery_v3_DeltaDiscoveryRequest_node(msg); @@ -977,7 +977,7 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_discovery_v3_DeltaDis } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_type_url(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(40, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_resource_names_subscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1062,11 +1062,11 @@ UPB_INLINE envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersi } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_response_nonce(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_error_detail(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, struct google_rpc_Status* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_error_detail(envoy_service_discovery_v3_DeltaDiscoveryRequest* msg, upb_Arena* arena) { struct google_rpc_Status* sub = (struct google_rpc_Status*)envoy_service_discovery_v3_DeltaDiscoveryRequest_error_detail(msg); @@ -1341,7 +1341,7 @@ UPB_INLINE upb_Array* _envoy_service_discovery_v3_DeltaDiscoveryResponse_removed UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_system_version_info(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_service_discovery_v3_Resource** envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1375,11 +1375,11 @@ UPB_INLINE struct envoy_service_discovery_v3_Resource* envoy_service_discovery_v } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_type_url(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(36, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_nonce(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(44, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_removed_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(16, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1411,7 +1411,7 @@ UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryResponse_add_removed_re } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_control_plane(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, struct envoy_config_core_v3_ControlPlane* value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 80), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -1567,7 +1567,7 @@ UPB_INLINE bool envoy_service_discovery_v3_DynamicParameterConstraints_has_not_c UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_constraint(envoy_service_discovery_v3_DynamicParameterConstraints *msg, envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_constraint(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint*)envoy_service_discovery_v3_DynamicParameterConstraints_constraint(msg); @@ -1579,7 +1579,7 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleC } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_or_constraints(envoy_service_discovery_v3_DynamicParameterConstraints *msg, envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_or_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)envoy_service_discovery_v3_DynamicParameterConstraints_or_constraints(msg); @@ -1591,7 +1591,7 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_Constra } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_and_constraints(envoy_service_discovery_v3_DynamicParameterConstraints *msg, envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_and_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList*)envoy_service_discovery_v3_DynamicParameterConstraints_and_constraints(msg); @@ -1603,7 +1603,7 @@ UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_Constra } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_set_not_constraints(envoy_service_discovery_v3_DynamicParameterConstraints *msg, envoy_service_discovery_v3_DynamicParameterConstraints* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints* envoy_service_discovery_v3_DynamicParameterConstraints_mutable_not_constraints(envoy_service_discovery_v3_DynamicParameterConstraints* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints*)envoy_service_discovery_v3_DynamicParameterConstraints_not_constraints(msg); @@ -1707,15 +1707,15 @@ UPB_INLINE bool envoy_service_discovery_v3_DynamicParameterConstraints_SingleCon UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_set_key(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_set_value(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_set_exists(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint *msg, envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_mutable_exists(envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists* sub = (struct envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_Exists*)envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_exists(msg); @@ -2039,11 +2039,11 @@ UPB_INLINE bool envoy_service_discovery_v3_Resource_has_metadata(const envoy_ser UPB_INLINE void envoy_service_discovery_v3_Resource_set_version(envoy_service_discovery_v3_Resource *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(36, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_discovery_v3_Resource_set_resource(envoy_service_discovery_v3_Resource *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_Resource_mutable_resource(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_service_discovery_v3_Resource_resource(msg); @@ -2055,7 +2055,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_service_discovery_v3_Resource_mutab } UPB_INLINE void envoy_service_discovery_v3_Resource_set_name(envoy_service_discovery_v3_Resource *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(44, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* envoy_service_discovery_v3_Resource_mutable_aliases(envoy_service_discovery_v3_Resource* msg, size_t* size) { upb_MiniTableField field = {4, UPB_SIZE(16, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2087,7 +2087,7 @@ UPB_INLINE bool envoy_service_discovery_v3_Resource_add_aliases(envoy_service_di } UPB_INLINE void envoy_service_discovery_v3_Resource_set_ttl(envoy_service_discovery_v3_Resource *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 64), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -2099,7 +2099,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_service_discovery_v3_Resource_ } UPB_INLINE void envoy_service_discovery_v3_Resource_set_cache_control(envoy_service_discovery_v3_Resource *msg, envoy_service_discovery_v3_Resource_CacheControl* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 72), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -2111,7 +2111,7 @@ UPB_INLINE struct envoy_service_discovery_v3_Resource_CacheControl* envoy_servic } UPB_INLINE void envoy_service_discovery_v3_Resource_set_resource_name(envoy_service_discovery_v3_Resource *msg, envoy_service_discovery_v3_ResourceName* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 80), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_service_discovery_v3_ResourceName* envoy_service_discovery_v3_Resource_mutable_resource_name(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) { struct envoy_service_discovery_v3_ResourceName* sub = (struct envoy_service_discovery_v3_ResourceName*)envoy_service_discovery_v3_Resource_resource_name(msg); @@ -2123,7 +2123,7 @@ UPB_INLINE struct envoy_service_discovery_v3_ResourceName* envoy_service_discove } UPB_INLINE void envoy_service_discovery_v3_Resource_set_metadata(envoy_service_discovery_v3_Resource *msg, struct envoy_config_core_v3_Metadata* value) { const upb_MiniTableField field = {9, UPB_SIZE(32, 88), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_service_discovery_v3_Resource_mutable_metadata(envoy_service_discovery_v3_Resource* msg, upb_Arena* arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_service_discovery_v3_Resource_metadata(msg); @@ -2185,7 +2185,7 @@ UPB_INLINE bool envoy_service_discovery_v3_Resource_CacheControl_do_not_cache(co UPB_INLINE void envoy_service_discovery_v3_Resource_CacheControl_set_do_not_cache(envoy_service_discovery_v3_Resource_CacheControl *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c index 252388a1f5..744b5fd20f 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceLocator_msg_init = { &envoy_service_discovery_v3_ResourceLocator_submsgs[0], &envoy_service_discovery_v3_ResourceLocator__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.ResourceLocator", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -47,6 +50,9 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceLocator__DynamicParam NULL, &envoy_service_discovery_v3_ResourceLocator_DynamicParametersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.ResourceLocator.DynamicParametersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -68,6 +74,9 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init = { &envoy_service_discovery_v3_ResourceName_submsgs[0], &envoy_service_discovery_v3_ResourceName__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.ResourceName", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -94,6 +103,9 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init = { &envoy_service_discovery_v3_DiscoveryRequest_submsgs[0], &envoy_service_discovery_v3_DiscoveryRequest__fields[0], UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DiscoveryRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -124,6 +136,9 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init = &envoy_service_discovery_v3_DiscoveryResponse_submsgs[0], &envoy_service_discovery_v3_DiscoveryResponse__fields[0], UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DiscoveryResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -160,6 +175,9 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_ini &envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[0], &envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[0], UPB_SIZE(56, 104), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DeltaDiscoveryRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -189,6 +207,9 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest__Initia NULL, &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DeltaDiscoveryRequest.InitialResourceVersionsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -217,6 +238,9 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_in &envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[0], &envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[0], UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DeltaDiscoveryResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -255,6 +279,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_m &envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[0], &envoy_service_discovery_v3_DynamicParameterConstraints__fields[0], UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DynamicParameterConstraints", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -281,6 +308,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[0], &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DynamicParameterConstraints.SingleConstraint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -293,6 +323,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DynamicParameterConstraints.SingleConstraint.Exists", +#endif }; static const upb_MiniTableSub envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[1] = { @@ -307,6 +340,9 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[0], &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.DynamicParameterConstraints.ConstraintList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -336,6 +372,9 @@ const upb_MiniTable envoy__service__discovery__v3__Resource_msg_init = { &envoy_service_discovery_v3_Resource_submsgs[0], &envoy_service_discovery_v3_Resource__fields[0], UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.Resource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -356,6 +395,9 @@ const upb_MiniTable envoy__service__discovery__v3__Resource__CacheControl_msg_in NULL, &envoy_service_discovery_v3_Resource_CacheControl__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.discovery.v3.Resource.CacheControl", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h index 46069d5d7a..3a54812419 100644 --- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h +++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb.h @@ -120,7 +120,7 @@ UPB_INLINE upb_Array* _envoy_service_load_stats_v3_LoadStatsRequest_cluster_stat UPB_INLINE void envoy_service_load_stats_v3_LoadStatsRequest_set_node(envoy_service_load_stats_v3_LoadStatsRequest *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(envoy_service_load_stats_v3_LoadStatsRequest* msg, upb_Arena* arena) { struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_load_stats_v3_LoadStatsRequest_node(msg); @@ -300,7 +300,7 @@ UPB_INLINE bool envoy_service_load_stats_v3_LoadStatsResponse_add_clusters(envoy } UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_load_reporting_interval(envoy_service_load_stats_v3_LoadStatsResponse *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_service_load_stats_v3_LoadStatsResponse_mutable_load_reporting_interval(envoy_service_load_stats_v3_LoadStatsResponse* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_service_load_stats_v3_LoadStatsResponse_load_reporting_interval(msg); @@ -312,11 +312,11 @@ UPB_INLINE struct google_protobuf_Duration* envoy_service_load_stats_v3_LoadStat } UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_report_endpoint_granularity(envoy_service_load_stats_v3_LoadStatsResponse *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_send_all_clusters(envoy_service_load_stats_v3_LoadStatsResponse *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(21, 10), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c index 850a103bbc..9692dc5530 100644 --- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsRequest_msg_init = &envoy_service_load_stats_v3_LoadStatsRequest_submsgs[0], &envoy_service_load_stats_v3_LoadStatsRequest__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.load_stats.v3.LoadStatsRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -54,6 +57,9 @@ const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsResponse_msg_init &envoy_service_load_stats_v3_LoadStatsResponse_submsgs[0], &envoy_service_load_stats_v3_LoadStatsResponse__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.load_stats.v3.LoadStatsResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prs_1bt}, diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h index ea96938843..65767ff2c1 100644 --- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h +++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb.h @@ -191,7 +191,7 @@ UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher* envoy_service_status_v3_Cli } UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_set_node(envoy_service_status_v3_ClientStatusRequest *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -203,7 +203,7 @@ UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientStatu } UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_set_exclude_resource_contents(envoy_service_status_v3_ClientStatusRequest *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.service.status.v3.PerXdsConfig */ @@ -362,11 +362,11 @@ UPB_INLINE int32_t envoy_service_status_v3_PerXdsConfig_client_status(const envo UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_status(envoy_service_status_v3_PerXdsConfig *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_listener_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ListenersConfigDump* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -378,7 +378,7 @@ UPB_INLINE struct envoy_admin_v3_ListenersConfigDump* envoy_service_status_v3_Pe } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_cluster_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ClustersConfigDump* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -390,7 +390,7 @@ UPB_INLINE struct envoy_admin_v3_ClustersConfigDump* envoy_service_status_v3_Per } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_route_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_RoutesConfigDump* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), -13, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -402,7 +402,7 @@ UPB_INLINE struct envoy_admin_v3_RoutesConfigDump* envoy_service_status_v3_PerXd } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_scoped_route_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ScopedRoutesConfigDump* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), -13, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -414,7 +414,7 @@ UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump* envoy_service_status_v3 } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_endpoint_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_EndpointsConfigDump* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 24), -13, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -426,7 +426,7 @@ UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump* envoy_service_status_v3_Pe } UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_client_status(envoy_service_status_v3_PerXdsConfig *msg, int32_t value) { const upb_MiniTableField field = {7, 16, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.service.status.v3.ClientConfig */ @@ -560,7 +560,7 @@ UPB_INLINE upb_StringView envoy_service_status_v3_ClientConfig_client_scope(cons UPB_INLINE void envoy_service_status_v3_ClientConfig_set_node(envoy_service_status_v3_ClientConfig *msg, struct envoy_config_core_v3_Node* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -632,7 +632,7 @@ UPB_INLINE struct envoy_service_status_v3_ClientConfig_GenericXdsConfig* envoy_s } UPB_INLINE void envoy_service_status_v3_ClientConfig_set_client_scope(envoy_service_status_v3_ClientConfig *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.service.status.v3.ClientConfig.GenericXdsConfig */ @@ -794,19 +794,19 @@ UPB_INLINE bool envoy_service_status_v3_ClientConfig_GenericXdsConfig_is_static_ UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_type_url(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(36, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_name(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(44, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_version_info(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(52, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_xds_config(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 72), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_xds_config(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_xds_config(msg); @@ -818,7 +818,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_service_status_v3_ClientConfig_Gene } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_last_updated(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 80), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_last_updated(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_last_updated(msg); @@ -830,15 +830,15 @@ UPB_INLINE struct google_protobuf_Timestamp* envoy_service_status_v3_ClientConfi } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_config_status(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, int32_t value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 12), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_client_status(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, int32_t value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 16), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_error_state(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, struct envoy_admin_v3_UpdateFailureState* value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 88), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_service_status_v3_ClientConfig_GenericXdsConfig_mutable_error_state(envoy_service_status_v3_ClientConfig_GenericXdsConfig* msg, upb_Arena* arena) { struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_service_status_v3_ClientConfig_GenericXdsConfig_error_state(msg); @@ -850,7 +850,7 @@ UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_service_status_v3_Cli } UPB_INLINE void envoy_service_status_v3_ClientConfig_GenericXdsConfig_set_is_static_resource(envoy_service_status_v3_ClientConfig_GenericXdsConfig *msg, bool value) { const upb_MiniTableField field = {9, UPB_SIZE(32, 20), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.service.status.v3.ClientStatusResponse */ diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c index 7bf4a562bc..4dafb073d4 100644 --- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c @@ -36,6 +36,9 @@ const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init = { &envoy_service_status_v3_ClientStatusRequest_submsgs[0], &envoy_service_status_v3_ClientStatusRequest__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.ClientStatusRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, @@ -66,6 +69,9 @@ const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init = { &envoy_service_status_v3_PerXdsConfig_submsgs[0], &envoy_service_status_v3_PerXdsConfig__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.PerXdsConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -95,6 +101,9 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init = { &envoy_service_status_v3_ClientConfig_submsgs[0], &envoy_service_status_v3_ClientConfig__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.ClientConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -129,6 +138,9 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_m &envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[0], &envoy_service_status_v3_ClientConfig_GenericXdsConfig__fields[0], UPB_SIZE(64, 96), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.ClientConfig.GenericXdsConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, @@ -161,6 +173,9 @@ const upb_MiniTable envoy__service__status__v3__ClientStatusResponse_msg_init = &envoy_service_status_v3_ClientStatusResponse_submsgs[0], &envoy_service_status_v3_ClientStatusResponse__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.service.status.v3.ClientStatusResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h index 452b0ab957..d55b10d866 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h +++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb.h @@ -107,11 +107,11 @@ UPB_INLINE upb_StringView envoy_type_http_v3_Cookie_path(const envoy_type_http_v UPB_INLINE void envoy_type_http_v3_Cookie_set_name(envoy_type_http_v3_Cookie *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_http_v3_Cookie_set_ttl(envoy_type_http_v3_Cookie *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_type_http_v3_Cookie_mutable_ttl(envoy_type_http_v3_Cookie* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_type_http_v3_Cookie_ttl(msg); @@ -123,7 +123,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_type_http_v3_Cookie_mutable_tt } UPB_INLINE void envoy_type_http_v3_Cookie_set_path(envoy_type_http_v3_Cookie *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c index 4b510a8140..4a43d458d2 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__type__http__v3__Cookie_msg_init = { &envoy_type_http_v3_Cookie_submsgs[0], &envoy_type_http_v3_Cookie__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.Cookie", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h index 92f12817d3..c960665265 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h +++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb.h @@ -210,7 +210,7 @@ UPB_INLINE bool envoy_type_http_v3_PathTransformation_Operation_has_merge_slashe UPB_INLINE void envoy_type_http_v3_PathTransformation_Operation_set_normalize_path_rfc_3986(envoy_type_http_v3_PathTransformation_Operation *msg, envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* envoy_type_http_v3_PathTransformation_Operation_mutable_normalize_path_rfc_3986(envoy_type_http_v3_PathTransformation_Operation* msg, upb_Arena* arena) { struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986* sub = (struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathRFC3986*)envoy_type_http_v3_PathTransformation_Operation_normalize_path_rfc_3986(msg); @@ -222,7 +222,7 @@ UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_NormalizePathR } UPB_INLINE void envoy_type_http_v3_PathTransformation_Operation_set_merge_slashes(envoy_type_http_v3_PathTransformation_Operation *msg, envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* envoy_type_http_v3_PathTransformation_Operation_mutable_merge_slashes(envoy_type_http_v3_PathTransformation_Operation* msg, upb_Arena* arena) { struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes* sub = (struct envoy_type_http_v3_PathTransformation_Operation_MergeSlashes*)envoy_type_http_v3_PathTransformation_Operation_merge_slashes(msg); diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c index 0b2d52dca3..210a0daa64 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init = { &envoy_type_http_v3_PathTransformation_submsgs[0], &envoy_type_http_v3_PathTransformation__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.PathTransformation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -46,6 +49,9 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_ini &envoy_type_http_v3_PathTransformation_Operation_submsgs[0], &envoy_type_http_v3_PathTransformation_Operation__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.PathTransformation.Operation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -58,12 +64,18 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__Normal NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.PathTransformation.Operation.NormalizePathRFC3986", +#endif }; const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.http.v3.PathTransformation.Operation.MergeSlashes", +#endif }; static const upb_MiniTable *messages_layout[4] = { diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h index 4eff370348..03253db4d6 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb.h @@ -104,11 +104,11 @@ UPB_INLINE bool envoy_type_matcher_v3_FilterStateMatcher_has_string_match(const UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_key(envoy_type_matcher_v3_FilterStateMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_FilterStateMatcher_set_string_match(envoy_type_matcher_v3_FilterStateMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_FilterStateMatcher_mutable_string_match(envoy_type_matcher_v3_FilterStateMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_FilterStateMatcher_string_match(msg); diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c index 61c5a81386..7a15139bdc 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init = { &envoy_type_matcher_v3_FilterStateMatcher_submsgs[0], &envoy_type_matcher_v3_FilterStateMatcher__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.FilterStateMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h index 67842ebe86..d908fec9a7 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb.h @@ -81,7 +81,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestHeaderMatchInput_head UPB_INLINE void envoy_type_matcher_v3_HttpRequestHeaderMatchInput_set_header_name(envoy_type_matcher_v3_HttpRequestHeaderMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.HttpRequestTrailerMatchInput */ @@ -135,7 +135,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestTrailerMatchInput_hea UPB_INLINE void envoy_type_matcher_v3_HttpRequestTrailerMatchInput_set_header_name(envoy_type_matcher_v3_HttpRequestTrailerMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.HttpResponseHeaderMatchInput */ @@ -189,7 +189,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpResponseHeaderMatchInput_hea UPB_INLINE void envoy_type_matcher_v3_HttpResponseHeaderMatchInput_set_header_name(envoy_type_matcher_v3_HttpResponseHeaderMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.HttpResponseTrailerMatchInput */ @@ -243,7 +243,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpResponseTrailerMatchInput_he UPB_INLINE void envoy_type_matcher_v3_HttpResponseTrailerMatchInput_set_header_name(envoy_type_matcher_v3_HttpResponseTrailerMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.HttpRequestQueryParamMatchInput */ @@ -297,7 +297,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_ UPB_INLINE void envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_set_query_param(envoy_type_matcher_v3_HttpRequestQueryParamMatchInput *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c index 6b28ca0b97..06abd1fa52 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c @@ -22,6 +22,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestHeaderMatchInput_msg_in NULL, &envoy_type_matcher_v3_HttpRequestHeaderMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpRequestHeaderMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -36,6 +39,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestTrailerMatchInput_msg_i NULL, &envoy_type_matcher_v3_HttpRequestTrailerMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpRequestTrailerMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -50,6 +56,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseHeaderMatchInput_msg_i NULL, &envoy_type_matcher_v3_HttpResponseHeaderMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpResponseHeaderMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -64,6 +73,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseTrailerMatchInput_msg_ NULL, &envoy_type_matcher_v3_HttpResponseTrailerMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpResponseTrailerMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -78,6 +90,9 @@ const upb_MiniTable envoy__type__matcher__v3__HttpRequestQueryParamMatchInput_ms NULL, &envoy_type_matcher_v3_HttpRequestQueryParamMatchInput__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpRequestQueryParamMatchInput", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h index cdbe2f347e..de6034d7f6 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb.h @@ -141,7 +141,7 @@ UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_invert(const envoy_type_ma UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_filter(envoy_type_matcher_v3_MetadataMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_type_matcher_v3_MetadataMatcher_PathSegment** envoy_type_matcher_v3_MetadataMatcher_mutable_path(envoy_type_matcher_v3_MetadataMatcher* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -175,7 +175,7 @@ UPB_INLINE struct envoy_type_matcher_v3_MetadataMatcher_PathSegment* envoy_type_ } UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_value(envoy_type_matcher_v3_MetadataMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_MetadataMatcher_mutable_value(envoy_type_matcher_v3_MetadataMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_MetadataMatcher_value(msg); @@ -187,7 +187,7 @@ UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_Meta } UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_set_invert(envoy_type_matcher_v3_MetadataMatcher *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.MetadataMatcher.PathSegment */ @@ -254,7 +254,7 @@ UPB_INLINE bool envoy_type_matcher_v3_MetadataMatcher_PathSegment_has_key(const UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_PathSegment_set_key(envoy_type_matcher_v3_MetadataMatcher_PathSegment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c index e4bb87fe1f..3225a2ab0e 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher_msg_init = { &envoy_type_matcher_v3_MetadataMatcher_submsgs[0], &envoy_type_matcher_v3_MetadataMatcher__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.MetadataMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -52,6 +55,9 @@ const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_i NULL, &envoy_type_matcher_v3_MetadataMatcher_PathSegment__fields[0], UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.MetadataMatcher.PathSegment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h index 8bd538b76a..8391ff7d1d 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb.h @@ -117,7 +117,7 @@ UPB_INLINE upb_Array* _envoy_type_matcher_v3_NodeMatcher_node_metadatas_mutable_ UPB_INLINE void envoy_type_matcher_v3_NodeMatcher_set_node_id(envoy_type_matcher_v3_NodeMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c index 0a1f96f876..aee0c43b65 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__type__matcher__v3__NodeMatcher_msg_init = { &envoy_type_matcher_v3_NodeMatcher_submsgs[0], &envoy_type_matcher_v3_NodeMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.NodeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h index 1c70d4436e..a9597359a9 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb.h @@ -110,7 +110,7 @@ UPB_INLINE bool envoy_type_matcher_v3_DoubleMatcher_has_exact(const envoy_type_m UPB_INLINE void envoy_type_matcher_v3_DoubleMatcher_set_range(envoy_type_matcher_v3_DoubleMatcher *msg, struct envoy_type_v3_DoubleRange* value) { const upb_MiniTableField field = {1, 16, -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_DoubleRange* envoy_type_matcher_v3_DoubleMatcher_mutable_range(envoy_type_matcher_v3_DoubleMatcher* msg, upb_Arena* arena) { struct envoy_type_v3_DoubleRange* sub = (struct envoy_type_v3_DoubleRange*)envoy_type_matcher_v3_DoubleMatcher_range(msg); @@ -122,7 +122,7 @@ UPB_INLINE struct envoy_type_v3_DoubleRange* envoy_type_matcher_v3_DoubleMatcher } UPB_INLINE void envoy_type_matcher_v3_DoubleMatcher_set_exact(envoy_type_matcher_v3_DoubleMatcher *msg, double value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c index b9df0f5994..561ceb9874 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__type__matcher__v3__DoubleMatcher_msg_init = { &envoy_type_matcher_v3_DoubleMatcher_submsgs[0], &envoy_type_matcher_v3_DoubleMatcher__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.DoubleMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h index 596f41b31b..c61a147b8d 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb.h @@ -93,7 +93,7 @@ UPB_INLINE bool envoy_type_matcher_v3_PathMatcher_has_path(const envoy_type_matc UPB_INLINE void envoy_type_matcher_v3_PathMatcher_set_path(envoy_type_matcher_v3_PathMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_PathMatcher_mutable_path(envoy_type_matcher_v3_PathMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_PathMatcher_path(msg); diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c index 13475d9bdc..2b0006b360 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__type__matcher__v3__PathMatcher_msg_init = { &envoy_type_matcher_v3_PathMatcher_submsgs[0], &envoy_type_matcher_v3_PathMatcher__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.PathMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h index 875e274121..98d33474d0 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb.h @@ -108,7 +108,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_RegexMatcher_regex(const envoy_t UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_set_google_re2(envoy_type_matcher_v3_RegexMatcher *msg, envoy_type_matcher_v3_RegexMatcher_GoogleRE2* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_matcher_v3_RegexMatcher_mutable_google_re2(envoy_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* sub = (struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2*)envoy_type_matcher_v3_RegexMatcher_google_re2(msg); @@ -120,7 +120,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher_GoogleRE2* envoy_type_match } UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_set_regex(envoy_type_matcher_v3_RegexMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.matcher.v3.RegexMatcher.GoogleRE2 */ @@ -178,7 +178,7 @@ UPB_INLINE bool envoy_type_matcher_v3_RegexMatcher_GoogleRE2_has_max_program_siz UPB_INLINE void envoy_type_matcher_v3_RegexMatcher_GoogleRE2_set_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2 *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_matcher_v3_RegexMatcher_GoogleRE2_mutable_max_program_size(envoy_type_matcher_v3_RegexMatcher_GoogleRE2* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_type_matcher_v3_RegexMatcher_GoogleRE2_max_program_size(msg); @@ -256,7 +256,7 @@ UPB_INLINE upb_StringView envoy_type_matcher_v3_RegexMatchAndSubstitute_substitu UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, envoy_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_RegexMatchAndSubstitute_mutable_pattern(envoy_type_matcher_v3_RegexMatchAndSubstitute* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern(msg); @@ -268,7 +268,7 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_Rege } UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_substitution(envoy_type_matcher_v3_RegexMatchAndSubstitute *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c index a0a1fee6c7..fb238383c6 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init = { &envoy_type_matcher_v3_RegexMatcher_submsgs[0], &envoy_type_matcher_v3_RegexMatcher__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.RegexMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000080100000a, &upb_pom_1bt_max64b}, @@ -50,6 +53,9 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = &envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[0], &envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.RegexMatcher.GoogleRE2", +#endif }; static const upb_MiniTableSub envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = { @@ -65,6 +71,9 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init = &envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[0], &envoy_type_matcher_v3_RegexMatchAndSubstitute__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.RegexMatchAndSubstitute", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c index 0ca616dc7d..4b15e52f27 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.c @@ -17,12 +17,18 @@ const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeMatchInput_m NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpResponseStatusCodeMatchInput", +#endif }; const upb_MiniTable envoy__type__matcher__v3__HttpResponseStatusCodeClassMatchInput_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.HttpResponseStatusCodeClassMatchInput", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h index c8dc27ac48..f52d767e28 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb.h @@ -13,6 +13,7 @@ #include "envoy/type/matcher/v3/string.upb_minitable.h" #include "envoy/type/matcher/v3/regex.upb_minitable.h" +#include "xds/core/v3/extension.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" #include "validate/validate.upb_minitable.h" @@ -27,6 +28,7 @@ extern "C" { typedef struct envoy_type_matcher_v3_StringMatcher { upb_Message UPB_PRIVATE(base); } envoy_type_matcher_v3_StringMatcher; typedef struct envoy_type_matcher_v3_ListStringMatcher { upb_Message UPB_PRIVATE(base); } envoy_type_matcher_v3_ListStringMatcher; struct envoy_type_matcher_v3_RegexMatcher; +struct xds_core_v3_TypedExtensionConfig; @@ -72,6 +74,7 @@ typedef enum { envoy_type_matcher_v3_StringMatcher_match_pattern_suffix = 3, envoy_type_matcher_v3_StringMatcher_match_pattern_safe_regex = 5, envoy_type_matcher_v3_StringMatcher_match_pattern_contains = 7, + envoy_type_matcher_v3_StringMatcher_match_pattern_custom = 8, envoy_type_matcher_v3_StringMatcher_match_pattern_NOT_SET = 0 } envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases; UPB_INLINE envoy_type_matcher_v3_StringMatcher_match_pattern_oneofcases envoy_type_matcher_v3_StringMatcher_match_pattern_case(const envoy_type_matcher_v3_StringMatcher* msg) { @@ -171,22 +174,38 @@ UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_contains(const envoy_typ const upb_MiniTableField field = {7, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void envoy_type_matcher_v3_StringMatcher_clear_custom(envoy_type_matcher_v3_StringMatcher* msg) { + const upb_MiniTableField field = {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const struct xds_core_v3_TypedExtensionConfig* envoy_type_matcher_v3_StringMatcher_custom(const envoy_type_matcher_v3_StringMatcher* msg) { + const struct xds_core_v3_TypedExtensionConfig* default_val = NULL; + const struct xds_core_v3_TypedExtensionConfig* ret; + const upb_MiniTableField field = {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_type_matcher_v3_StringMatcher_has_custom(const envoy_type_matcher_v3_StringMatcher* msg) { + const upb_MiniTableField field = {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_exact(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_prefix(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_suffix(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_safe_regex(envoy_type_matcher_v3_StringMatcher *msg, struct envoy_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {5, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_StringMatcher_mutable_safe_regex(envoy_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_RegexMatcher* sub = (struct envoy_type_matcher_v3_RegexMatcher*)envoy_type_matcher_v3_StringMatcher_safe_regex(msg); @@ -198,11 +217,23 @@ UPB_INLINE struct envoy_type_matcher_v3_RegexMatcher* envoy_type_matcher_v3_Stri } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_ignore_case(envoy_type_matcher_v3_StringMatcher *msg, bool value) { const upb_MiniTableField field = {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_contains(envoy_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {7, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void envoy_type_matcher_v3_StringMatcher_set_custom(envoy_type_matcher_v3_StringMatcher *msg, struct xds_core_v3_TypedExtensionConfig* value) { + const upb_MiniTableField field = {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct xds_core_v3_TypedExtensionConfig* envoy_type_matcher_v3_StringMatcher_mutable_custom(envoy_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) { + struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)envoy_type_matcher_v3_StringMatcher_custom(msg); + if (sub == NULL) { + sub = (struct xds_core_v3_TypedExtensionConfig*)_upb_Message_New(&xds__core__v3__TypedExtensionConfig_msg_init, arena); + if (sub) envoy_type_matcher_v3_StringMatcher_set_custom(msg, sub); + } + return sub; } /* envoy.type.matcher.v3.ListStringMatcher */ diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c index 568743b69a..22adb6bf23 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.c @@ -9,6 +9,7 @@ #include "upb/generated_code_support.h" #include "envoy/type/matcher/v3/string.upb_minitable.h" #include "envoy/type/matcher/v3/regex.upb_minitable.h" +#include "xds/core/v3/extension.upb_minitable.h" #include "udpa/annotations/status.upb_minitable.h" #include "udpa/annotations/versioning.upb_minitable.h" #include "validate/validate.upb_minitable.h" @@ -16,23 +17,28 @@ // Must be last. #include "upb/port/def.inc" -static const upb_MiniTableSub envoy_type_matcher_v3_StringMatcher_submsgs[1] = { +static const upb_MiniTableSub envoy_type_matcher_v3_StringMatcher_submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init}, + {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init}, }; -static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[6] = { +static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[7] = { {1, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {2, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {3, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, {5, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {7, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {8, 16, -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = { &envoy_type_matcher_v3_StringMatcher_submsgs[0], &envoy_type_matcher_v3_StringMatcher__fields[0], - UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, + UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.StringMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pos_1bt}, @@ -42,6 +48,14 @@ const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = { {0x0010000c0500002a, &upb_pom_1bt_maxmaxb}, {0x000800003f000030, &upb_psb1_1bt}, {0x0010000c0700003a, &upb_pos_1bt}, + {0x0010000c08010042, &upb_pom_1bt_maxmaxb}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, + {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, }) }; @@ -57,6 +71,9 @@ const upb_MiniTable envoy__type__matcher__v3__ListStringMatcher_msg_init = { &envoy_type_matcher_v3_ListStringMatcher_submsgs[0], &envoy_type_matcher_v3_ListStringMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.ListStringMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h index d43a1056bf..547291911a 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb.h @@ -147,7 +147,7 @@ UPB_INLINE struct envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_ma } UPB_INLINE void envoy_type_matcher_v3_StructMatcher_set_value(envoy_type_matcher_v3_StructMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -222,7 +222,7 @@ UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_PathSegment_has_key(const en UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_set_key(envoy_type_matcher_v3_StructMatcher_PathSegment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c index 8484febbcc..330d63f80e 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable envoy__type__matcher__v3__StructMatcher_msg_init = { &envoy_type_matcher_v3_StructMatcher_submsgs[0], &envoy_type_matcher_v3_StructMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.StructMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -46,6 +49,9 @@ const upb_MiniTable envoy__type__matcher__v3__StructMatcher__PathSegment_msg_ini NULL, &envoy_type_matcher_v3_StructMatcher_PathSegment__fields[0], UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.StructMatcher.PathSegment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h index 12fd8b4b81..f6cdac0e42 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb.h @@ -200,7 +200,7 @@ UPB_INLINE bool envoy_type_matcher_v3_ValueMatcher_has_or_match(const envoy_type UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_null_match(envoy_type_matcher_v3_ValueMatcher *msg, envoy_type_matcher_v3_ValueMatcher_NullMatch* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_matcher_v3_ValueMatcher_mutable_null_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ValueMatcher_NullMatch* sub = (struct envoy_type_matcher_v3_ValueMatcher_NullMatch*)envoy_type_matcher_v3_ValueMatcher_null_match(msg); @@ -212,7 +212,7 @@ UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher_NullMatch* envoy_type_match } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_double_match(envoy_type_matcher_v3_ValueMatcher *msg, struct envoy_type_matcher_v3_DoubleMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_double_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_DoubleMatcher* sub = (struct envoy_type_matcher_v3_DoubleMatcher*)envoy_type_matcher_v3_ValueMatcher_double_match(msg); @@ -224,7 +224,7 @@ UPB_INLINE struct envoy_type_matcher_v3_DoubleMatcher* envoy_type_matcher_v3_Val } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_string_match(envoy_type_matcher_v3_ValueMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_string_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_ValueMatcher_string_match(msg); @@ -236,15 +236,15 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Val } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_bool_match(envoy_type_matcher_v3_ValueMatcher *msg, bool value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_present_match(envoy_type_matcher_v3_ValueMatcher *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_list_match(envoy_type_matcher_v3_ValueMatcher *msg, envoy_type_matcher_v3_ListMatcher* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_list_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ListMatcher* sub = (struct envoy_type_matcher_v3_ListMatcher*)envoy_type_matcher_v3_ValueMatcher_list_match(msg); @@ -256,7 +256,7 @@ UPB_INLINE struct envoy_type_matcher_v3_ListMatcher* envoy_type_matcher_v3_Value } UPB_INLINE void envoy_type_matcher_v3_ValueMatcher_set_or_match(envoy_type_matcher_v3_ValueMatcher *msg, envoy_type_matcher_v3_OrMatcher* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_OrMatcher* envoy_type_matcher_v3_ValueMatcher_mutable_or_match(envoy_type_matcher_v3_ValueMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_OrMatcher* sub = (struct envoy_type_matcher_v3_OrMatcher*)envoy_type_matcher_v3_ValueMatcher_or_match(msg); @@ -369,7 +369,7 @@ UPB_INLINE bool envoy_type_matcher_v3_ListMatcher_has_one_of(const envoy_type_ma UPB_INLINE void envoy_type_matcher_v3_ListMatcher_set_one_of(envoy_type_matcher_v3_ListMatcher *msg, envoy_type_matcher_v3_ValueMatcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_ListMatcher_mutable_one_of(envoy_type_matcher_v3_ListMatcher* msg, upb_Arena* arena) { struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_ListMatcher_one_of(msg); diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c index 0967c114ba..17bd63007d 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.c @@ -39,6 +39,9 @@ const upb_MiniTable envoy__type__matcher__v3__ValueMatcher_msg_init = { &envoy_type_matcher_v3_ValueMatcher_submsgs[0], &envoy_type_matcher_v3_ValueMatcher__fields[0], UPB_SIZE(16, 24), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.ValueMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -55,6 +58,9 @@ const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init = NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.ValueMatcher.NullMatch", +#endif }; static const upb_MiniTableSub envoy_type_matcher_v3_ListMatcher_submsgs[1] = { @@ -69,6 +75,9 @@ const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init = { &envoy_type_matcher_v3_ListMatcher_submsgs[0], &envoy_type_matcher_v3_ListMatcher__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.ListMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -87,6 +96,9 @@ const upb_MiniTable envoy__type__matcher__v3__OrMatcher_msg_init = { &envoy_type_matcher_v3_OrMatcher_submsgs[0], &envoy_type_matcher_v3_OrMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.matcher.v3.OrMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h index 91ff43bf06..27de07aa9c 100644 --- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h +++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb.h @@ -116,7 +116,7 @@ UPB_INLINE upb_Array* _envoy_type_metadata_v3_MetadataKey_path_mutable_upb_array UPB_INLINE void envoy_type_metadata_v3_MetadataKey_set_key(envoy_type_metadata_v3_MetadataKey *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE envoy_type_metadata_v3_MetadataKey_PathSegment** envoy_type_metadata_v3_MetadataKey_mutable_path(envoy_type_metadata_v3_MetadataKey* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -213,7 +213,7 @@ UPB_INLINE bool envoy_type_metadata_v3_MetadataKey_PathSegment_has_key(const env UPB_INLINE void envoy_type_metadata_v3_MetadataKey_PathSegment_set_key(envoy_type_metadata_v3_MetadataKey_PathSegment *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.metadata.v3.MetadataKind */ @@ -331,7 +331,7 @@ UPB_INLINE bool envoy_type_metadata_v3_MetadataKind_has_host(const envoy_type_me UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_request(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Request* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metadata_v3_MetadataKind_mutable_request(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind_Request* sub = (struct envoy_type_metadata_v3_MetadataKind_Request*)envoy_type_metadata_v3_MetadataKind_request(msg); @@ -343,7 +343,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Request* envoy_type_metada } UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_route(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Route* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata_v3_MetadataKind_mutable_route(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind_Route* sub = (struct envoy_type_metadata_v3_MetadataKind_Route*)envoy_type_metadata_v3_MetadataKind_route(msg); @@ -355,7 +355,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Route* envoy_type_metadata } UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_cluster(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Cluster* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metadata_v3_MetadataKind_mutable_cluster(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind_Cluster* sub = (struct envoy_type_metadata_v3_MetadataKind_Cluster*)envoy_type_metadata_v3_MetadataKind_cluster(msg); @@ -367,7 +367,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Cluster* envoy_type_metada } UPB_INLINE void envoy_type_metadata_v3_MetadataKind_set_host(envoy_type_metadata_v3_MetadataKind *msg, envoy_type_metadata_v3_MetadataKind_Host* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind_Host* envoy_type_metadata_v3_MetadataKind_mutable_host(envoy_type_metadata_v3_MetadataKind* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind_Host* sub = (struct envoy_type_metadata_v3_MetadataKind_Host*)envoy_type_metadata_v3_MetadataKind_host(msg); diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c index 8a51c59b44..866f03dad5 100644 --- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKey_msg_init = { &envoy_type_metadata_v3_MetadataKey_submsgs[0], &envoy_type_metadata_v3_MetadataKey__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKey", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -44,6 +47,9 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init NULL, &envoy_type_metadata_v3_MetadataKey_PathSegment__fields[0], UPB_SIZE(24, 32), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKey.PathSegment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -68,6 +74,9 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind_msg_init = { &envoy_type_metadata_v3_MetadataKind_submsgs[0], &envoy_type_metadata_v3_MetadataKind__fields[0], UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -84,24 +93,36 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Request_msg_init = NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind.Request", +#endif }; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Route_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind.Route", +#endif }; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Cluster_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind.Cluster", +#endif }; const upb_MiniTable envoy__type__metadata__v3__MetadataKind__Host_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.metadata.v3.MetadataKind.Host", +#endif }; static const upb_MiniTable *messages_layout[7] = { diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h index a3fe106c4f..a685a68927 100644 --- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h +++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb.h @@ -161,11 +161,11 @@ UPB_INLINE bool envoy_type_tracing_v3_CustomTag_has_metadata(const envoy_type_tr UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_tag(envoy_type_tracing_v3_CustomTag *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_literal(envoy_type_tracing_v3_CustomTag *msg, envoy_type_tracing_v3_CustomTag_Literal* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3_CustomTag_mutable_literal(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) { struct envoy_type_tracing_v3_CustomTag_Literal* sub = (struct envoy_type_tracing_v3_CustomTag_Literal*)envoy_type_tracing_v3_CustomTag_literal(msg); @@ -177,7 +177,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Literal* envoy_type_tracing_v3 } UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_environment(envoy_type_tracing_v3_CustomTag *msg, envoy_type_tracing_v3_CustomTag_Environment* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracing_v3_CustomTag_mutable_environment(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) { struct envoy_type_tracing_v3_CustomTag_Environment* sub = (struct envoy_type_tracing_v3_CustomTag_Environment*)envoy_type_tracing_v3_CustomTag_environment(msg); @@ -189,7 +189,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Environment* envoy_type_tracin } UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_request_header(envoy_type_tracing_v3_CustomTag *msg, envoy_type_tracing_v3_CustomTag_Header* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_CustomTag_mutable_request_header(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) { struct envoy_type_tracing_v3_CustomTag_Header* sub = (struct envoy_type_tracing_v3_CustomTag_Header*)envoy_type_tracing_v3_CustomTag_request_header(msg); @@ -201,7 +201,7 @@ UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Header* envoy_type_tracing_v3_ } UPB_INLINE void envoy_type_tracing_v3_CustomTag_set_metadata(envoy_type_tracing_v3_CustomTag *msg, envoy_type_tracing_v3_CustomTag_Metadata* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 32), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_tracing_v3_CustomTag_Metadata* envoy_type_tracing_v3_CustomTag_mutable_metadata(envoy_type_tracing_v3_CustomTag* msg, upb_Arena* arena) { struct envoy_type_tracing_v3_CustomTag_Metadata* sub = (struct envoy_type_tracing_v3_CustomTag_Metadata*)envoy_type_tracing_v3_CustomTag_metadata(msg); @@ -263,7 +263,7 @@ UPB_INLINE upb_StringView envoy_type_tracing_v3_CustomTag_Literal_value(const en UPB_INLINE void envoy_type_tracing_v3_CustomTag_Literal_set_value(envoy_type_tracing_v3_CustomTag_Literal *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.tracing.v3.CustomTag.Environment */ @@ -329,11 +329,11 @@ UPB_INLINE upb_StringView envoy_type_tracing_v3_CustomTag_Environment_default_va UPB_INLINE void envoy_type_tracing_v3_CustomTag_Environment_set_name(envoy_type_tracing_v3_CustomTag_Environment *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_tracing_v3_CustomTag_Environment_set_default_value(envoy_type_tracing_v3_CustomTag_Environment *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.tracing.v3.CustomTag.Header */ @@ -399,11 +399,11 @@ UPB_INLINE upb_StringView envoy_type_tracing_v3_CustomTag_Header_default_value(c UPB_INLINE void envoy_type_tracing_v3_CustomTag_Header_set_name(envoy_type_tracing_v3_CustomTag_Header *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_tracing_v3_CustomTag_Header_set_default_value(envoy_type_tracing_v3_CustomTag_Header *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.tracing.v3.CustomTag.Metadata */ @@ -489,7 +489,7 @@ UPB_INLINE upb_StringView envoy_type_tracing_v3_CustomTag_Metadata_default_value UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_kind(envoy_type_tracing_v3_CustomTag_Metadata *msg, struct envoy_type_metadata_v3_MetadataKind* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKind* envoy_type_tracing_v3_CustomTag_Metadata_mutable_kind(envoy_type_tracing_v3_CustomTag_Metadata* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKind* sub = (struct envoy_type_metadata_v3_MetadataKind*)envoy_type_tracing_v3_CustomTag_Metadata_kind(msg); @@ -501,7 +501,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKind* envoy_type_tracing_v3_Cus } UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_metadata_key(envoy_type_tracing_v3_CustomTag_Metadata *msg, struct envoy_type_metadata_v3_MetadataKey* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_type_tracing_v3_CustomTag_Metadata_mutable_metadata_key(envoy_type_tracing_v3_CustomTag_Metadata* msg, upb_Arena* arena) { struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_type_tracing_v3_CustomTag_Metadata_metadata_key(msg); @@ -513,7 +513,7 @@ UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_type_tracing_v3_Cust } UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_default_value(envoy_type_tracing_v3_CustomTag_Metadata *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c index 2657f28b38..71a72baf89 100644 --- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.c @@ -35,6 +35,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag_msg_init = { &envoy_type_tracing_v3_CustomTag_submsgs[0], &envoy_type_tracing_v3_CustomTag__fields[0], UPB_SIZE(24, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -55,6 +58,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Literal_msg_init = { NULL, &envoy_type_tracing_v3_CustomTag_Literal__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag.Literal", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -70,6 +76,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Environment_msg_init = NULL, &envoy_type_tracing_v3_CustomTag_Environment__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag.Environment", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -87,6 +96,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Header_msg_init = { NULL, &envoy_type_tracing_v3_CustomTag_Header__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag.Header", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -110,6 +122,9 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Metadata_msg_init = { &envoy_type_tracing_v3_CustomTag_Metadata_submsgs[0], &envoy_type_tracing_v3_CustomTag_Metadata__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.tracing.v3.CustomTag.Metadata", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h index 7b9e0e2905..784b9ad89e 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb.h @@ -110,7 +110,7 @@ UPB_INLINE bool envoy_type_v3_HashPolicy_has_filter_state(const envoy_type_v3_Ha UPB_INLINE void envoy_type_v3_HashPolicy_set_source_ip(envoy_type_v3_HashPolicy *msg, envoy_type_v3_HashPolicy_SourceIp* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_mutable_source_ip(envoy_type_v3_HashPolicy* msg, upb_Arena* arena) { struct envoy_type_v3_HashPolicy_SourceIp* sub = (struct envoy_type_v3_HashPolicy_SourceIp*)envoy_type_v3_HashPolicy_source_ip(msg); @@ -122,7 +122,7 @@ UPB_INLINE struct envoy_type_v3_HashPolicy_SourceIp* envoy_type_v3_HashPolicy_mu } UPB_INLINE void envoy_type_v3_HashPolicy_set_filter_state(envoy_type_v3_HashPolicy *msg, envoy_type_v3_HashPolicy_FilterState* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_HashPolicy_FilterState* envoy_type_v3_HashPolicy_mutable_filter_state(envoy_type_v3_HashPolicy* msg, upb_Arena* arena) { struct envoy_type_v3_HashPolicy_FilterState* sub = (struct envoy_type_v3_HashPolicy_FilterState*)envoy_type_v3_HashPolicy_filter_state(msg); @@ -222,7 +222,7 @@ UPB_INLINE upb_StringView envoy_type_v3_HashPolicy_FilterState_key(const envoy_t UPB_INLINE void envoy_type_v3_HashPolicy_FilterState_set_key(envoy_type_v3_HashPolicy_FilterState *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c index 8e7b920974..de7bad7194 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable envoy__type__v3__HashPolicy_msg_init = { &envoy_type_v3_HashPolicy_submsgs[0], &envoy_type_v3_HashPolicy__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.HashPolicy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -41,6 +44,9 @@ const upb_MiniTable envoy__type__v3__HashPolicy__SourceIp_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.HashPolicy.SourceIp", +#endif }; static const upb_MiniTableField envoy_type_v3_HashPolicy_FilterState__fields[1] = { @@ -51,6 +57,9 @@ const upb_MiniTable envoy__type__v3__HashPolicy__FilterState_msg_init = { NULL, &envoy_type_v3_HashPolicy_FilterState__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.HashPolicy.FilterState", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h index f176569aaa..7bba667026 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb.h @@ -138,7 +138,7 @@ UPB_INLINE int32_t envoy_type_v3_HttpStatus_code(const envoy_type_v3_HttpStatus* UPB_INLINE void envoy_type_v3_HttpStatus_set_code(envoy_type_v3_HttpStatus *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c index d51d8bf552..753271ec95 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__type__v3__HttpStatus_msg_init = { NULL, &envoy_type_v3_HttpStatus__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.HttpStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h b/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h index 5080aad6e8..fbc1ccc5dc 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb.h @@ -85,7 +85,7 @@ UPB_INLINE double envoy_type_v3_Percent_value(const envoy_type_v3_Percent* msg) UPB_INLINE void envoy_type_v3_Percent_set_value(envoy_type_v3_Percent *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.v3.FractionalPercent */ @@ -151,11 +151,11 @@ UPB_INLINE int32_t envoy_type_v3_FractionalPercent_denominator(const envoy_type_ UPB_INLINE void envoy_type_v3_FractionalPercent_set_numerator(envoy_type_v3_FractionalPercent *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_FractionalPercent_set_denominator(envoy_type_v3_FractionalPercent *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c index 719753b93e..b1c326948f 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__type__v3__Percent_msg_init = { NULL, &envoy_type_v3_Percent__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.Percent", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -38,6 +41,9 @@ const upb_MiniTable envoy__type__v3__FractionalPercent_msg_init = { NULL, &envoy_type_v3_FractionalPercent__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.FractionalPercent", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb.h b/src/core/ext/upb-gen/envoy/type/v3/range.upb.h index 9ed48de0c8..497e60a999 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/range.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb.h @@ -91,11 +91,11 @@ UPB_INLINE int64_t envoy_type_v3_Int64Range_end(const envoy_type_v3_Int64Range* UPB_INLINE void envoy_type_v3_Int64Range_set_start(envoy_type_v3_Int64Range *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_Int64Range_set_end(envoy_type_v3_Int64Range *msg, int64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.v3.Int32Range */ @@ -161,11 +161,11 @@ UPB_INLINE int32_t envoy_type_v3_Int32Range_end(const envoy_type_v3_Int32Range* UPB_INLINE void envoy_type_v3_Int32Range_set_start(envoy_type_v3_Int32Range *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_Int32Range_set_end(envoy_type_v3_Int32Range *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* envoy.type.v3.DoubleRange */ @@ -231,11 +231,11 @@ UPB_INLINE double envoy_type_v3_DoubleRange_end(const envoy_type_v3_DoubleRange* UPB_INLINE void envoy_type_v3_DoubleRange_set_start(envoy_type_v3_DoubleRange *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_DoubleRange_set_end(envoy_type_v3_DoubleRange *msg, double value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c index 39c018fc68..9ffc6f5454 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable envoy__type__v3__Int64Range_msg_init = { NULL, &envoy_type_v3_Int64Range__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.Int64Range", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -40,6 +43,9 @@ const upb_MiniTable envoy__type__v3__Int32Range_msg_init = { NULL, &envoy_type_v3_Int32Range__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.Int32Range", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -57,6 +63,9 @@ const upb_MiniTable envoy__type__v3__DoubleRange_msg_init = { NULL, &envoy_type_v3_DoubleRange__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.DoubleRange", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h index 939c9182d2..c94e29ac2d 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb.h @@ -134,11 +134,11 @@ UPB_INLINE bool envoy_type_v3_RateLimitStrategy_has_token_bucket(const envoy_typ UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_blanket_rule(envoy_type_v3_RateLimitStrategy *msg, int32_t value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_requests_per_time_unit(envoy_type_v3_RateLimitStrategy *msg, envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_type_v3_RateLimitStrategy_mutable_requests_per_time_unit(envoy_type_v3_RateLimitStrategy* msg, upb_Arena* arena) { struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* sub = (struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit*)envoy_type_v3_RateLimitStrategy_requests_per_time_unit(msg); @@ -150,7 +150,7 @@ UPB_INLINE struct envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit* envoy_typ } UPB_INLINE void envoy_type_v3_RateLimitStrategy_set_token_bucket(envoy_type_v3_RateLimitStrategy *msg, struct envoy_type_v3_TokenBucket* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct envoy_type_v3_TokenBucket* envoy_type_v3_RateLimitStrategy_mutable_token_bucket(envoy_type_v3_RateLimitStrategy* msg, upb_Arena* arena) { struct envoy_type_v3_TokenBucket* sub = (struct envoy_type_v3_TokenBucket*)envoy_type_v3_RateLimitStrategy_token_bucket(msg); @@ -224,11 +224,11 @@ UPB_INLINE int32_t envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_time_unit UPB_INLINE void envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_set_requests_per_time_unit(envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit *msg, uint64_t value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_set_time_unit(envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c index 229ad57279..9b1b35c1f6 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__type__v3__RateLimitStrategy_msg_init = { &envoy_type_v3_RateLimitStrategy_submsgs[0], &envoy_type_v3_RateLimitStrategy__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.RateLimitStrategy", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pov4_1bt}, @@ -49,6 +52,9 @@ const upb_MiniTable envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_ NULL, &envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.RateLimitStrategy.RequestsPerTimeUnit", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h index 224636031d..704ae97196 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb.h @@ -101,15 +101,15 @@ UPB_INLINE uint32_t envoy_type_v3_SemanticVersion_patch(const envoy_type_v3_Sema UPB_INLINE void envoy_type_v3_SemanticVersion_set_major_number(envoy_type_v3_SemanticVersion *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_SemanticVersion_set_minor_number(envoy_type_v3_SemanticVersion *msg, uint32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_SemanticVersion_set_patch(envoy_type_v3_SemanticVersion *msg, uint32_t value) { const upb_MiniTableField field = {3, 16, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c index 6af83230d0..923ec89a45 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable envoy__type__v3__SemanticVersion_msg_init = { NULL, &envoy_type_v3_SemanticVersion__fields[0], 24, 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.SemanticVersion", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h index 21f1706af5..24696afb70 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb.h @@ -114,11 +114,11 @@ UPB_INLINE bool envoy_type_v3_TokenBucket_has_fill_interval(const envoy_type_v3_ UPB_INLINE void envoy_type_v3_TokenBucket_set_max_tokens(envoy_type_v3_TokenBucket *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void envoy_type_v3_TokenBucket_set_tokens_per_fill(envoy_type_v3_TokenBucket *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, 16, 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_v3_TokenBucket_mutable_tokens_per_fill(envoy_type_v3_TokenBucket* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_type_v3_TokenBucket_tokens_per_fill(msg); @@ -130,7 +130,7 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_type_v3_TokenBucket_mutable } UPB_INLINE void envoy_type_v3_TokenBucket_set_fill_interval(envoy_type_v3_TokenBucket *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* envoy_type_v3_TokenBucket_mutable_fill_interval(envoy_type_v3_TokenBucket* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_type_v3_TokenBucket_fill_interval(msg); diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c index 390a13684d..dcfe1e086d 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable envoy__type__v3__TokenBucket_msg_init = { &envoy_type_v3_TokenBucket_submsgs[0], &envoy_type_v3_TokenBucket__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.type.v3.TokenBucket", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/google/api/annotations.upb.h b/src/core/ext/upb-gen/google/api/annotations.upb.h index 68316455fe..681baa3335 100644 --- a/src/core/ext/upb-gen/google/api/annotations.upb.h +++ b/src/core/ext/upb-gen/google/api/annotations.upb.h @@ -46,9 +46,18 @@ UPB_INLINE void google_api_set_http(struct google_protobuf_MethodOptions* msg, c UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct google_api_HttpRule* google_api_mutable_http(struct google_protobuf_MethodOptions* msg, + upb_Arena* arena) { + struct google_api_HttpRule* sub = (struct google_api_HttpRule*)google_api_http(msg); + if (sub == NULL) { + sub = (struct google_api_HttpRule*)_upb_Message_New(&google__api__HttpRule_msg_init, arena); + if (sub) google_api_set_http(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h index 26012012e9..8336f7c2ff 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb.h @@ -239,7 +239,7 @@ UPB_INLINE google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry* google_api_expr_v1 } UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_set_expr(google_api_expr_v1alpha1_CheckedExpr *msg, struct google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_CheckedExpr_mutable_expr(google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_CheckedExpr_expr(msg); @@ -251,7 +251,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Checke } UPB_INLINE void google_api_expr_v1alpha1_CheckedExpr_set_source_info(google_api_expr_v1alpha1_CheckedExpr *msg, struct google_api_expr_v1alpha1_SourceInfo* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_CheckedExpr_mutable_source_info(google_api_expr_v1alpha1_CheckedExpr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_SourceInfo* sub = (struct google_api_expr_v1alpha1_SourceInfo*)google_api_expr_v1alpha1_CheckedExpr_source_info(msg); @@ -572,7 +572,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Type_has_abstract_type(const google_api UPB_INLINE void google_api_expr_v1alpha1_Type_set_dyn(google_api_expr_v1alpha1_Type *msg, struct google_protobuf_Empty* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_dyn(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)google_api_expr_v1alpha1_Type_dyn(msg); @@ -584,23 +584,23 @@ UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_d } UPB_INLINE void google_api_expr_v1alpha1_Type_set_null(google_api_expr_v1alpha1_Type *msg, int32_t value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_primitive(google_api_expr_v1alpha1_Type *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_wrapper(google_api_expr_v1alpha1_Type *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_well_known(google_api_expr_v1alpha1_Type *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 16), -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_list_type(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type_ListType* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alpha1_Type_mutable_list_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type_ListType* sub = (struct google_api_expr_v1alpha1_Type_ListType*)google_api_expr_v1alpha1_Type_list_type(msg); @@ -612,7 +612,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type_ListType* google_api_expr_v1alph } UPB_INLINE void google_api_expr_v1alpha1_Type_set_map_type(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type_MapType* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha1_Type_mutable_map_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type_MapType* sub = (struct google_api_expr_v1alpha1_Type_MapType*)google_api_expr_v1alpha1_Type_map_type(msg); @@ -624,7 +624,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type_MapType* google_api_expr_v1alpha } UPB_INLINE void google_api_expr_v1alpha1_Type_set_function(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type_FunctionType* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1alpha1_Type_mutable_function(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type_FunctionType* sub = (struct google_api_expr_v1alpha1_Type_FunctionType*)google_api_expr_v1alpha1_Type_function(msg); @@ -636,15 +636,15 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type_FunctionType* google_api_expr_v1 } UPB_INLINE void google_api_expr_v1alpha1_Type_set_message_type(google_api_expr_v1alpha1_Type *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_type_param(google_api_expr_v1alpha1_Type *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Type_set_type(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {11, UPB_SIZE(12, 16), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_mutable_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_type(msg); @@ -656,7 +656,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_m } UPB_INLINE void google_api_expr_v1alpha1_Type_set_error(google_api_expr_v1alpha1_Type *msg, struct google_protobuf_Empty* value) { const upb_MiniTableField field = {12, UPB_SIZE(12, 16), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_error(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_protobuf_Empty* sub = (struct google_protobuf_Empty*)google_api_expr_v1alpha1_Type_error(msg); @@ -668,7 +668,7 @@ UPB_INLINE struct google_protobuf_Empty* google_api_expr_v1alpha1_Type_mutable_e } UPB_INLINE void google_api_expr_v1alpha1_Type_set_abstract_type(google_api_expr_v1alpha1_Type *msg, google_api_expr_v1alpha1_Type_AbstractType* value) { const upb_MiniTableField field = {14, UPB_SIZE(12, 16), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type_AbstractType* google_api_expr_v1alpha1_Type_mutable_abstract_type(google_api_expr_v1alpha1_Type* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type_AbstractType* sub = (struct google_api_expr_v1alpha1_Type_AbstractType*)google_api_expr_v1alpha1_Type_abstract_type(msg); @@ -734,7 +734,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Type_ListType_has_elem_type(const googl UPB_INLINE void google_api_expr_v1alpha1_Type_ListType_set_elem_type(google_api_expr_v1alpha1_Type_ListType *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_ListType_mutable_elem_type(google_api_expr_v1alpha1_Type_ListType* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_ListType_elem_type(msg); @@ -816,7 +816,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Type_MapType_has_value_type(const googl UPB_INLINE void google_api_expr_v1alpha1_Type_MapType_set_key_type(google_api_expr_v1alpha1_Type_MapType *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_MapType_mutable_key_type(google_api_expr_v1alpha1_Type_MapType* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_MapType_key_type(msg); @@ -828,7 +828,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_M } UPB_INLINE void google_api_expr_v1alpha1_Type_MapType_set_value_type(google_api_expr_v1alpha1_Type_MapType *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_MapType_mutable_value_type(google_api_expr_v1alpha1_Type_MapType* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_MapType_value_type(msg); @@ -926,7 +926,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Type_FunctionType_arg_types_muta UPB_INLINE void google_api_expr_v1alpha1_Type_FunctionType_set_result_type(google_api_expr_v1alpha1_Type_FunctionType *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Type_FunctionType_mutable_result_type(google_api_expr_v1alpha1_Type_FunctionType* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Type_FunctionType_result_type(msg); @@ -1050,7 +1050,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Type_AbstractType_parameter_type UPB_INLINE void google_api_expr_v1alpha1_Type_AbstractType_set_name(google_api_expr_v1alpha1_Type_AbstractType *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_api_expr_v1alpha1_Type** google_api_expr_v1alpha1_Type_AbstractType_mutable_parameter_types(google_api_expr_v1alpha1_Type_AbstractType* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1176,11 +1176,11 @@ UPB_INLINE bool google_api_expr_v1alpha1_Decl_has_function(const google_api_expr UPB_INLINE void google_api_expr_v1alpha1_Decl_set_name(google_api_expr_v1alpha1_Decl *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Decl_set_ident(google_api_expr_v1alpha1_Decl *msg, google_api_expr_v1alpha1_Decl_IdentDecl* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alpha1_Decl_mutable_ident(google_api_expr_v1alpha1_Decl* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Decl_IdentDecl* sub = (struct google_api_expr_v1alpha1_Decl_IdentDecl*)google_api_expr_v1alpha1_Decl_ident(msg); @@ -1192,7 +1192,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Decl_IdentDecl* google_api_expr_v1alp } UPB_INLINE void google_api_expr_v1alpha1_Decl_set_function(google_api_expr_v1alpha1_Decl *msg, google_api_expr_v1alpha1_Decl_FunctionDecl* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Decl_FunctionDecl* google_api_expr_v1alpha1_Decl_mutable_function(google_api_expr_v1alpha1_Decl* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Decl_FunctionDecl* sub = (struct google_api_expr_v1alpha1_Decl_FunctionDecl*)google_api_expr_v1alpha1_Decl_function(msg); @@ -1286,7 +1286,7 @@ UPB_INLINE upb_StringView google_api_expr_v1alpha1_Decl_IdentDecl_doc(const goog UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_type(google_api_expr_v1alpha1_Decl_IdentDecl *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_IdentDecl_mutable_type(google_api_expr_v1alpha1_Decl_IdentDecl* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Decl_IdentDecl_type(msg); @@ -1298,7 +1298,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_I } UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_value(google_api_expr_v1alpha1_Decl_IdentDecl *msg, struct google_api_expr_v1alpha1_Constant* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Decl_IdentDecl_mutable_value(google_api_expr_v1alpha1_Decl_IdentDecl* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Decl_IdentDecl_value(msg); @@ -1310,7 +1310,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_De } UPB_INLINE void google_api_expr_v1alpha1_Decl_IdentDecl_set_doc(google_api_expr_v1alpha1_Decl_IdentDecl *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.expr.v1alpha1.Decl.FunctionDecl */ @@ -1568,7 +1568,7 @@ UPB_INLINE upb_StringView google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_do UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_overload_id(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_api_expr_v1alpha1_Type** google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_mutable_params(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1630,7 +1630,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_add_type_par } UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_result_type(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, google_api_expr_v1alpha1_Type* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_mutable_result_type(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Type* sub = (struct google_api_expr_v1alpha1_Type*)google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_result_type(msg); @@ -1642,11 +1642,11 @@ UPB_INLINE struct google_api_expr_v1alpha1_Type* google_api_expr_v1alpha1_Decl_F } UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_is_instance_function(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_set_doc(google_api_expr_v1alpha1_Decl_FunctionDecl_Overload *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(36, 56), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.expr.v1alpha1.Reference */ @@ -1748,7 +1748,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Reference_has_value(const google_api_ex UPB_INLINE void google_api_expr_v1alpha1_Reference_set_name(google_api_expr_v1alpha1_Reference *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* google_api_expr_v1alpha1_Reference_mutable_overload_id(google_api_expr_v1alpha1_Reference* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1780,7 +1780,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Reference_add_overload_id(google_api_ex } UPB_INLINE void google_api_expr_v1alpha1_Reference_set_value(google_api_expr_v1alpha1_Reference *msg, struct google_api_expr_v1alpha1_Constant* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Reference_mutable_value(google_api_expr_v1alpha1_Reference* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Reference_value(msg); diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c index 2b96e30985..1ac713de42 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init = { &google_api_expr_v1alpha1_CheckedExpr_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.CheckedExpr", +#endif }; static const upb_MiniTableSub google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = { @@ -48,6 +51,9 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_ &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.CheckedExpr.ReferenceMapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -67,6 +73,9 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_i &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[0], &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.CheckedExpr.TypeMapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -103,6 +112,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init = { &google_api_expr_v1alpha1_Type_submsgs[0], &google_api_expr_v1alpha1_Type__fields[0], UPB_SIZE(24, 32), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -135,6 +147,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init = { &google_api_expr_v1alpha1_Type_ListType_submsgs[0], &google_api_expr_v1alpha1_Type_ListType__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type.ListType", +#endif }; static const upb_MiniTableSub google_api_expr_v1alpha1_Type_MapType_submsgs[2] = { @@ -151,6 +166,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init = { &google_api_expr_v1alpha1_Type_MapType_submsgs[0], &google_api_expr_v1alpha1_Type_MapType__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type.MapType", +#endif }; static const upb_MiniTableSub google_api_expr_v1alpha1_Type_FunctionType_submsgs[2] = { @@ -167,6 +185,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init = { &google_api_expr_v1alpha1_Type_FunctionType_submsgs[0], &google_api_expr_v1alpha1_Type_FunctionType__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type.FunctionType", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -188,6 +209,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init = { &google_api_expr_v1alpha1_Type_AbstractType_submsgs[0], &google_api_expr_v1alpha1_Type_AbstractType__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Type.AbstractType", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -211,6 +235,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init = { &google_api_expr_v1alpha1_Decl_submsgs[0], &google_api_expr_v1alpha1_Decl__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Decl", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -234,6 +261,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init = { &google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[0], &google_api_expr_v1alpha1_Decl_IdentDecl__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Decl.IdentDecl", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -254,6 +284,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init = { &google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[0], &google_api_expr_v1alpha1_Decl_FunctionDecl__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Decl.FunctionDecl", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -278,6 +311,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_ms &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[0], &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Decl.FunctionDecl.Overload", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -304,6 +340,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Reference_msg_init = { &google_api_expr_v1alpha1_Reference_submsgs[0], &google_api_expr_v1alpha1_Reference__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Reference", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h index 58dc06daf9..d11f020947 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb.h @@ -113,7 +113,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_ParsedExpr_has_source_info(const google UPB_INLINE void google_api_expr_v1alpha1_ParsedExpr_set_expr(google_api_expr_v1alpha1_ParsedExpr *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_ParsedExpr_mutable_expr(google_api_expr_v1alpha1_ParsedExpr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_ParsedExpr_expr(msg); @@ -125,7 +125,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Parsed } UPB_INLINE void google_api_expr_v1alpha1_ParsedExpr_set_source_info(google_api_expr_v1alpha1_ParsedExpr *msg, google_api_expr_v1alpha1_SourceInfo* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_SourceInfo* google_api_expr_v1alpha1_ParsedExpr_mutable_source_info(google_api_expr_v1alpha1_ParsedExpr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_SourceInfo* sub = (struct google_api_expr_v1alpha1_SourceInfo*)google_api_expr_v1alpha1_ParsedExpr_source_info(msg); @@ -314,11 +314,11 @@ UPB_INLINE bool google_api_expr_v1alpha1_Expr_has_comprehension_expr(const googl UPB_INLINE void google_api_expr_v1alpha1_Expr_set_id(google_api_expr_v1alpha1_Expr *msg, int64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_const_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Constant* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 24), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Expr_mutable_const_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Constant* sub = (struct google_api_expr_v1alpha1_Constant*)google_api_expr_v1alpha1_Expr_const_expr(msg); @@ -330,7 +330,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Ex } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_ident_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_Ident* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 24), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_Expr_mutable_ident_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_Ident* sub = (struct google_api_expr_v1alpha1_Expr_Ident*)google_api_expr_v1alpha1_Expr_ident_expr(msg); @@ -342,7 +342,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_Ident* google_api_expr_v1alpha1_ } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_select_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_Select* value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 24), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1_Expr_mutable_select_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_Select* sub = (struct google_api_expr_v1alpha1_Expr_Select*)google_api_expr_v1alpha1_Expr_select_expr(msg); @@ -354,7 +354,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_Select* google_api_expr_v1alpha1 } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_call_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_Call* value) { const upb_MiniTableField field = {6, UPB_SIZE(12, 24), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_Expr_mutable_call_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_Call* sub = (struct google_api_expr_v1alpha1_Expr_Call*)google_api_expr_v1alpha1_Expr_call_expr(msg); @@ -366,7 +366,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_Call* google_api_expr_v1alpha1_E } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_list_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_CreateList* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 24), -9, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1alpha1_Expr_mutable_list_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_CreateList* sub = (struct google_api_expr_v1alpha1_Expr_CreateList*)google_api_expr_v1alpha1_Expr_list_expr(msg); @@ -378,7 +378,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateList* google_api_expr_v1al } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_struct_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_CreateStruct* value) { const upb_MiniTableField field = {8, UPB_SIZE(12, 24), -9, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1alpha1_Expr_mutable_struct_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_CreateStruct* sub = (struct google_api_expr_v1alpha1_Expr_CreateStruct*)google_api_expr_v1alpha1_Expr_struct_expr(msg); @@ -390,7 +390,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr_CreateStruct* google_api_expr_v1 } UPB_INLINE void google_api_expr_v1alpha1_Expr_set_comprehension_expr(google_api_expr_v1alpha1_Expr *msg, google_api_expr_v1alpha1_Expr_Comprehension* value) { const upb_MiniTableField field = {9, UPB_SIZE(12, 24), -9, 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr_Comprehension* google_api_expr_v1alpha1_Expr_mutable_comprehension_expr(google_api_expr_v1alpha1_Expr* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr_Comprehension* sub = (struct google_api_expr_v1alpha1_Expr_Comprehension*)google_api_expr_v1alpha1_Expr_comprehension_expr(msg); @@ -452,7 +452,7 @@ UPB_INLINE upb_StringView google_api_expr_v1alpha1_Expr_Ident_name(const google_ UPB_INLINE void google_api_expr_v1alpha1_Expr_Ident_set_name(google_api_expr_v1alpha1_Expr_Ident *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.expr.v1alpha1.Expr.Select */ @@ -534,7 +534,7 @@ UPB_INLINE bool google_api_expr_v1alpha1_Expr_Select_test_only(const google_api_ UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_set_operand(google_api_expr_v1alpha1_Expr_Select *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Select_mutable_operand(google_api_expr_v1alpha1_Expr_Select* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Select_operand(msg); @@ -546,11 +546,11 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_S } UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_set_field(google_api_expr_v1alpha1_Expr_Select *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_Select_set_test_only(google_api_expr_v1alpha1_Expr_Select *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.expr.v1alpha1.Expr.Call */ @@ -652,7 +652,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_Call_args_mutable_upb_array UPB_INLINE void google_api_expr_v1alpha1_Expr_Call_set_target(google_api_expr_v1alpha1_Expr_Call *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Call_mutable_target(google_api_expr_v1alpha1_Expr_Call* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Call_target(msg); @@ -664,7 +664,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Call_set_function(google_api_expr_v1alpha1_Expr_Call *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_api_expr_v1alpha1_Expr** google_api_expr_v1alpha1_Expr_Call_mutable_args(google_api_expr_v1alpha1_Expr_Call* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(16, 40), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -880,7 +880,7 @@ UPB_INLINE upb_Array* _google_api_expr_v1alpha1_Expr_CreateStruct_entries_mutabl UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_set_message_name(google_api_expr_v1alpha1_Expr_CreateStruct *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_api_expr_v1alpha1_Expr_CreateStruct_Entry** google_api_expr_v1alpha1_Expr_CreateStruct_mutable_entries(google_api_expr_v1alpha1_Expr_CreateStruct* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 24), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1022,15 +1022,15 @@ UPB_INLINE bool google_api_expr_v1alpha1_Expr_CreateStruct_Entry_has_value(const UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_id(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, int64_t value) { const upb_MiniTableField field = {1, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_field_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 16), -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_map_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 16), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_mutable_map_key(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_CreateStruct_Entry_map_key(msg); @@ -1042,7 +1042,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_CreateStruct_Entry_set_value(google_api_expr_v1alpha1_Expr_CreateStruct_Entry *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 40), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_CreateStruct_Entry_mutable_value(google_api_expr_v1alpha1_Expr_CreateStruct_Entry* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_CreateStruct_Entry_value(msg); @@ -1196,11 +1196,11 @@ UPB_INLINE bool google_api_expr_v1alpha1_Expr_Comprehension_has_result(const goo UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_iter_var(google_api_expr_v1alpha1_Expr_Comprehension *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_iter_range(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_iter_range(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_iter_range(msg); @@ -1212,11 +1212,11 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_accu_var(google_api_expr_v1alpha1_Expr_Comprehension *msg, upb_StringView value) { const upb_MiniTableField field = {3, 40, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_accu_init(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 56), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_accu_init(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_accu_init(msg); @@ -1228,7 +1228,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_loop_condition(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 64), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_loop_condition(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_loop_condition(msg); @@ -1240,7 +1240,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_loop_step(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 72), 67, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_loop_step(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_loop_step(msg); @@ -1252,7 +1252,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_C } UPB_INLINE void google_api_expr_v1alpha1_Expr_Comprehension_set_result(google_api_expr_v1alpha1_Expr_Comprehension *msg, google_api_expr_v1alpha1_Expr* value) { const upb_MiniTableField field = {7, UPB_SIZE(28, 80), 68, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_Expr_Comprehension_mutable_result(google_api_expr_v1alpha1_Expr_Comprehension* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_Expr* sub = (struct google_api_expr_v1alpha1_Expr*)google_api_expr_v1alpha1_Expr_Comprehension_result(msg); @@ -1463,35 +1463,35 @@ UPB_INLINE bool google_api_expr_v1alpha1_Constant_has_timestamp_value(const goog UPB_INLINE void google_api_expr_v1alpha1_Constant_set_null_value(google_api_expr_v1alpha1_Constant *msg, int32_t value) { const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_bool_value(google_api_expr_v1alpha1_Constant *msg, bool value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_int64_value(google_api_expr_v1alpha1_Constant *msg, int64_t value) { const upb_MiniTableField field = {3, 16, -9, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_uint64_value(google_api_expr_v1alpha1_Constant *msg, uint64_t value) { const upb_MiniTableField field = {4, 16, -9, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_double_value(google_api_expr_v1alpha1_Constant *msg, double value) { const upb_MiniTableField field = {5, 16, -9, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_string_value(google_api_expr_v1alpha1_Constant *msg, upb_StringView value) { const upb_MiniTableField field = {6, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_bytes_value(google_api_expr_v1alpha1_Constant *msg, upb_StringView value) { const upb_MiniTableField field = {7, 16, -9, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_duration_value(google_api_expr_v1alpha1_Constant *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {8, 16, -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* google_api_expr_v1alpha1_Constant_mutable_duration_value(google_api_expr_v1alpha1_Constant* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)google_api_expr_v1alpha1_Constant_duration_value(msg); @@ -1503,7 +1503,7 @@ UPB_INLINE struct google_protobuf_Duration* google_api_expr_v1alpha1_Constant_mu } UPB_INLINE void google_api_expr_v1alpha1_Constant_set_timestamp_value(google_api_expr_v1alpha1_Constant *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {9, 16, -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* google_api_expr_v1alpha1_Constant_mutable_timestamp_value(google_api_expr_v1alpha1_Constant* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)google_api_expr_v1alpha1_Constant_timestamp_value(msg); @@ -1667,11 +1667,11 @@ UPB_INLINE upb_Map* _google_api_expr_v1alpha1_SourceInfo_macro_calls_mutable_upb UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_set_syntax_version(google_api_expr_v1alpha1_SourceInfo *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_set_location(google_api_expr_v1alpha1_SourceInfo *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* google_api_expr_v1alpha1_SourceInfo_mutable_line_offsets(google_api_expr_v1alpha1_SourceInfo* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(8, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsPacked | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1877,19 +1877,19 @@ UPB_INLINE int32_t google_api_expr_v1alpha1_SourcePosition_column(const google_a UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_location(google_api_expr_v1alpha1_SourcePosition *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_offset(google_api_expr_v1alpha1_SourcePosition *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_line(google_api_expr_v1alpha1_SourcePosition *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_column(google_api_expr_v1alpha1_SourcePosition *msg, int32_t value) { const upb_MiniTableField field = {4, 16, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c index 46d54904c0..09046cd120 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.c @@ -29,6 +29,9 @@ const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init = { &google_api_expr_v1alpha1_ParsedExpr_submsgs[0], &google_api_expr_v1alpha1_ParsedExpr__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.ParsedExpr", +#endif }; static const upb_MiniTableSub google_api_expr_v1alpha1_Expr_submsgs[7] = { @@ -56,6 +59,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr_msg_init = { &google_api_expr_v1alpha1_Expr_submsgs[0], &google_api_expr_v1alpha1_Expr__fields[0], UPB_SIZE(24, 32), 8, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -84,6 +90,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Ident_msg_init = { NULL, &google_api_expr_v1alpha1_Expr_Ident__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.Ident", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -104,6 +113,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init = { &google_api_expr_v1alpha1_Expr_Select_submsgs[0], &google_api_expr_v1alpha1_Expr_Select__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.Select", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -127,6 +139,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init = { &google_api_expr_v1alpha1_Expr_Call_submsgs[0], &google_api_expr_v1alpha1_Expr_Call__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.Call", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -147,6 +162,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init = { &google_api_expr_v1alpha1_Expr_CreateList_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.CreateList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -166,6 +184,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init = { &google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateStruct__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.CreateStruct", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -190,6 +211,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_i &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[0], &google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[0], UPB_SIZE(40, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.CreateStruct.Entry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f000008, &upb_psv8_1bt}, @@ -220,6 +244,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init = &google_api_expr_v1alpha1_Expr_Comprehension_submsgs[0], &google_api_expr_v1alpha1_Expr_Comprehension__fields[0], UPB_SIZE(48, 88), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Expr.Comprehension", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -249,6 +276,9 @@ const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = { &google_api_expr_v1alpha1_Constant_submsgs[0], &google_api_expr_v1alpha1_Constant__fields[0], UPB_SIZE(24, 32), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.Constant", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pov4_1bt}, @@ -286,6 +316,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init = { &google_api_expr_v1alpha1_SourceInfo_submsgs[0], &google_api_expr_v1alpha1_SourceInfo__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourceInfo", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -303,6 +336,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_ NULL, &google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourceInfo.PositionsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -324,6 +360,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[0], &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourceInfo.MacroCallsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, @@ -341,6 +380,9 @@ const upb_MiniTable google__api__expr__v1alpha1__SourcePosition_msg_init = { NULL, &google_api_expr_v1alpha1_SourcePosition__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.expr.v1alpha1.SourcePosition", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/google/api/http.upb.h b/src/core/ext/upb-gen/google/api/http.upb.h index d7054cab6a..fd9e2bac99 100644 --- a/src/core/ext/upb-gen/google/api/http.upb.h +++ b/src/core/ext/upb-gen/google/api/http.upb.h @@ -138,7 +138,7 @@ UPB_INLINE struct google_api_HttpRule* google_api_Http_add_rules(google_api_Http } UPB_INLINE void google_api_Http_set_fully_decode_reserved_expansion(google_api_Http *msg, bool value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.HttpRule */ @@ -358,35 +358,35 @@ UPB_INLINE upb_StringView google_api_HttpRule_response_body(const google_api_Htt UPB_INLINE void google_api_HttpRule_set_selector(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_get(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_put(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_post(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {4, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_delete(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {5, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_patch(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {6, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_body(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpRule_set_custom(google_api_HttpRule *msg, google_api_CustomHttpPattern* value) { const upb_MiniTableField field = {8, 16, -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_CustomHttpPattern* google_api_HttpRule_mutable_custom(google_api_HttpRule* msg, upb_Arena* arena) { struct google_api_CustomHttpPattern* sub = (struct google_api_CustomHttpPattern*)google_api_HttpRule_custom(msg); @@ -428,7 +428,7 @@ UPB_INLINE struct google_api_HttpRule* google_api_HttpRule_add_additional_bindin } UPB_INLINE void google_api_HttpRule_set_response_body(google_api_HttpRule *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(40, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.api.CustomHttpPattern */ @@ -494,11 +494,11 @@ UPB_INLINE upb_StringView google_api_CustomHttpPattern_path(const google_api_Cus UPB_INLINE void google_api_CustomHttpPattern_set_kind(google_api_CustomHttpPattern *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_CustomHttpPattern_set_path(google_api_CustomHttpPattern *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/google/api/http.upb_minitable.c b/src/core/ext/upb-gen/google/api/http.upb_minitable.c index f90f5a7782..e74f38d28c 100644 --- a/src/core/ext/upb-gen/google/api/http.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/http.upb_minitable.c @@ -25,6 +25,9 @@ const upb_MiniTable google__api__Http_msg_init = { &google_api_Http_submsgs[0], &google_api_Http__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.Http", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max128b}, @@ -55,6 +58,9 @@ const upb_MiniTable google__api__HttpRule_msg_init = { &google_api_HttpRule_submsgs[0], &google_api_HttpRule__fields[0], UPB_SIZE(48, 88), 10, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.HttpRule", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000003f00000a, &upb_pss_1bt}, @@ -84,6 +90,9 @@ const upb_MiniTable google__api__CustomHttpPattern_msg_init = { NULL, &google_api_CustomHttpPattern__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.CustomHttpPattern", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb.h b/src/core/ext/upb-gen/google/api/httpbody.upb.h index 188e53c39d..72e122a63a 100644 --- a/src/core/ext/upb-gen/google/api/httpbody.upb.h +++ b/src/core/ext/upb-gen/google/api/httpbody.upb.h @@ -121,11 +121,11 @@ UPB_INLINE upb_Array* _google_api_HttpBody_extensions_mutable_upb_array(google_a UPB_INLINE void google_api_HttpBody_set_content_type(google_api_HttpBody *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_api_HttpBody_set_data(google_api_HttpBody *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** google_api_HttpBody_mutable_extensions(google_api_HttpBody* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(8, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c index d3be877f36..50bf37c9af 100644 --- a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable google__api__HttpBody_msg_init = { &google_api_HttpBody_submsgs[0], &google_api_HttpBody__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.api.HttpBody", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb.h b/src/core/ext/upb-gen/google/protobuf/any.upb.h index e107bccff8..0d50f0afc5 100644 --- a/src/core/ext/upb-gen/google/protobuf/any.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/any.upb.h @@ -86,11 +86,11 @@ UPB_INLINE upb_StringView google_protobuf_Any_value(const google_protobuf_Any* m UPB_INLINE void google_protobuf_Any_set_type_url(google_protobuf_Any *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Any_set_value(google_protobuf_Any *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c index 8caab6bef9..9b0d3c38e5 100644 --- a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable google__protobuf__Any_msg_init = { NULL, &google_protobuf_Any__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Any", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h index d7c7870318..d2a8801415 100644 --- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h @@ -37,6 +37,7 @@ typedef struct google_protobuf_FileOptions { upb_Message UPB_PRIVATE(base); } go typedef struct google_protobuf_MessageOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_MessageOptions; typedef struct google_protobuf_FieldOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldOptions; typedef struct google_protobuf_FieldOptions_EditionDefault { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldOptions_EditionDefault; +typedef struct google_protobuf_FieldOptions_FeatureSupport { upb_Message UPB_PRIVATE(base); } google_protobuf_FieldOptions_FeatureSupport; typedef struct google_protobuf_OneofOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_OneofOptions; typedef struct google_protobuf_EnumOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumOptions; typedef struct google_protobuf_EnumValueOptions { upb_Message UPB_PRIVATE(base); } google_protobuf_EnumValueOptions; @@ -56,6 +57,7 @@ typedef enum { google_protobuf_EDITION_UNKNOWN = 0, google_protobuf_EDITION_1_TEST_ONLY = 1, google_protobuf_EDITION_2_TEST_ONLY = 2, + google_protobuf_EDITION_LEGACY = 900, google_protobuf_EDITION_PROTO2 = 998, google_protobuf_EDITION_PROTO3 = 999, google_protobuf_EDITION_2023 = 1000, @@ -645,11 +647,11 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_has_edition(const google_pro UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(52, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(60, 32), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 48), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -801,7 +803,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDesc } UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) { const upb_MiniTableField field = {8, UPB_SIZE(32, 88), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg); @@ -813,7 +815,7 @@ UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorPro } UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 96), 67, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg); @@ -881,11 +883,11 @@ UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_p } UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {12, UPB_SIZE(68, 120), 68, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileDescriptorProto_set_edition(google_protobuf_FileDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {14, UPB_SIZE(48, 12), 69, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.DescriptorProto */ @@ -1215,7 +1217,7 @@ UPB_INLINE upb_Array* _google_protobuf_DescriptorProto_reserved_name_mutable_upb UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(48, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1369,7 +1371,7 @@ UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_Descript } UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 72), 65, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg); @@ -1555,15 +1557,15 @@ UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), 66, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) { struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg); @@ -1645,11 +1647,11 @@ UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const goog UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.ExtensionRangeOptions */ @@ -1817,11 +1819,11 @@ UPB_INLINE struct google_protobuf_ExtensionRangeOptions_Declaration* google_prot } UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_verification(google_protobuf_ExtensionRangeOptions *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_features(google_protobuf_ExtensionRangeOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {50, UPB_SIZE(20, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ExtensionRangeOptions_mutable_features(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ExtensionRangeOptions_features(msg); @@ -1981,23 +1983,23 @@ UPB_INLINE bool google_protobuf_ExtensionRangeOptions_Declaration_has_repeated(c UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_number(google_protobuf_ExtensionRangeOptions_Declaration *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_full_name(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_type(google_protobuf_ExtensionRangeOptions_Declaration *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(28, 40), 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_reserved(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) { const upb_MiniTableField field = {5, 16, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ExtensionRangeOptions_Declaration_set_repeated(google_protobuf_ExtensionRangeOptions_Declaration *msg, bool value) { const upb_MiniTableField field = {6, 17, 68, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FieldDescriptorProto */ @@ -2215,35 +2217,35 @@ UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const g UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(36, 32), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(44, 48), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 66, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {4, 16, 67, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {5, 20, 68, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(52, 64), 69, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(60, 80), 70, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) { const upb_MiniTableField field = {8, UPB_SIZE(24, 96), 71, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg); @@ -2255,15 +2257,15 @@ UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorP } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {9, UPB_SIZE(28, 24), 72, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {10, UPB_SIZE(68, 104), 73, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) { const upb_MiniTableField field = {17, UPB_SIZE(32, 28), 74, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.OneofDescriptorProto */ @@ -2337,11 +2339,11 @@ UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_pr UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg); @@ -2519,7 +2521,7 @@ UPB_INLINE upb_Array* _google_protobuf_EnumDescriptorProto_reserved_name_mutable UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2553,7 +2555,7 @@ UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_Enum } UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg); @@ -2693,11 +2695,11 @@ UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(co UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.EnumValueDescriptorProto */ @@ -2787,15 +2789,15 @@ UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const googl UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 66, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg); @@ -2909,7 +2911,7 @@ UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_ UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2943,7 +2945,7 @@ UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_Service } UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg); @@ -3089,19 +3091,19 @@ UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 32), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(36, 48), 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 67, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) { struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg); @@ -3113,11 +3115,11 @@ UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescripto } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 9), 68, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(17, 10), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FileOptions */ @@ -3511,83 +3513,83 @@ UPB_INLINE upb_Array* _google_protobuf_FileOptions_uninterpreted_option_mutable_ UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {8, 40, 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) { const upb_MiniTableField field = {9, 12, 66, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {10, 16, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {11, UPB_SIZE(48, 56), 68, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {16, 17, 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {17, 18, 70, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {18, 19, 71, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {20, 20, 72, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {23, 21, 73, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {27, 22, 74, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) { const upb_MiniTableField field = {31, 23, 75, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {36, UPB_SIZE(56, 72), 76, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {37, UPB_SIZE(64, 88), 77, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {39, UPB_SIZE(72, 104), 78, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {40, UPB_SIZE(80, 120), 79, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {41, UPB_SIZE(88, 136), 80, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {44, UPB_SIZE(96, 152), 81, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) { const upb_MiniTableField field = {45, UPB_SIZE(104, 168), 82, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FileOptions_set_features(google_protobuf_FileOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {50, UPB_SIZE(24, 184), 83, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FileOptions_mutable_features(google_protobuf_FileOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FileOptions_features(msg); @@ -3795,27 +3797,27 @@ UPB_INLINE upb_Array* _google_protobuf_MessageOptions_uninterpreted_option_mutab UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {2, 10, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {3, 11, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {7, 12, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_MessageOptions *msg, bool value) { const upb_MiniTableField field = {11, 13, 68, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MessageOptions_set_features(google_protobuf_MessageOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {12, 16, 69, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MessageOptions_mutable_features(google_protobuf_MessageOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MessageOptions_features(msg); @@ -3893,19 +3895,19 @@ UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf return ptr; } UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; - const upb_MiniTableField field = {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_packed(google_protobuf_FieldOptions* msg) { @@ -3957,19 +3959,19 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_Fiel return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; - const upb_MiniTableField field = {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_weak(google_protobuf_FieldOptions* msg) { @@ -4021,27 +4023,27 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_proto return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) { int32_t default_val = 0; int32_t ret; - const upb_MiniTableField field = {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE void google_protobuf_FieldOptions_clear_targets(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_protobuf_FieldOptions* msg, size_t* size) { - const upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4052,7 +4054,7 @@ UPB_INLINE int32_t const* google_protobuf_FieldOptions_targets(const google_prot } } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { - const upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4060,7 +4062,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_targets_upb_array(cons return arr; } UPB_INLINE upb_Array* _google_protobuf_FieldOptions_targets_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4116,12 +4118,28 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_features(const google_protobuf_ const upb_MiniTableField field = {21, UPB_SIZE(40, 48), 73, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void google_protobuf_FieldOptions_clear_feature_support(google_protobuf_FieldOptions* msg) { + const upb_MiniTableField field = {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_feature_support(const google_protobuf_FieldOptions* msg) { + const google_protobuf_FieldOptions_FeatureSupport* default_val = NULL; + const google_protobuf_FieldOptions_FeatureSupport* ret; + const upb_MiniTableField field = {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_has_feature_support(const google_protobuf_FieldOptions* msg) { + const upb_MiniTableField field = {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) { - const upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) { - const upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4132,7 +4150,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Fie } } UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_upb_array(const google_protobuf_FieldOptions* msg, size_t* size) { - const upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4140,7 +4158,7 @@ UPB_INLINE const upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_u return arr; } UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable_upb_array(google_protobuf_FieldOptions* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4150,43 +4168,43 @@ UPB_INLINE upb_Array* _google_protobuf_FieldOptions_uninterpreted_option_mutable } UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) { - const upb_MiniTableField field = {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {3, 17, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {5, 18, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) { - const upb_MiniTableField field = {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {10, 24, 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {15, 25, 70, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_FieldOptions *msg, bool value) { const upb_MiniTableField field = {16, 26, 71, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) { - const upb_MiniTableField field = {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + const upb_MiniTableField field = {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf_FieldOptions* msg, size_t* size) { - upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4197,12 +4215,12 @@ UPB_INLINE int32_t* google_protobuf_FieldOptions_mutable_targets(google_protobuf } } UPB_INLINE int32_t* google_protobuf_FieldOptions_resize_targets(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (int32_t*)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE bool google_protobuf_FieldOptions_add_targets(google_protobuf_FieldOptions* msg, int32_t val, upb_Arena* arena) { - upb_MiniTableField field = {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4245,7 +4263,7 @@ UPB_INLINE struct google_protobuf_FieldOptions_EditionDefault* google_protobuf_F } UPB_INLINE void google_protobuf_FieldOptions_set_features(google_protobuf_FieldOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {21, UPB_SIZE(40, 48), 73, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutable_features(google_protobuf_FieldOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FieldOptions_features(msg); @@ -4255,8 +4273,20 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FieldOptions_mutab } return sub; } +UPB_INLINE void google_protobuf_FieldOptions_set_feature_support(google_protobuf_FieldOptions *msg, google_protobuf_FieldOptions_FeatureSupport* value) { + const upb_MiniTableField field = {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_mutable_feature_support(google_protobuf_FieldOptions* msg, upb_Arena* arena) { + struct google_protobuf_FieldOptions_FeatureSupport* sub = (struct google_protobuf_FieldOptions_FeatureSupport*)google_protobuf_FieldOptions_feature_support(msg); + if (sub == NULL) { + sub = (struct google_protobuf_FieldOptions_FeatureSupport*)_upb_Message_New(&google__protobuf__FieldOptions__FeatureSupport_msg_init, arena); + if (sub) google_protobuf_FieldOptions_set_feature_support(msg, sub); + } + return sub; +} UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) { - upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4267,12 +4297,12 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mu } } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) { - upb_MiniTableField field = {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4357,11 +4387,129 @@ UPB_INLINE bool google_protobuf_FieldOptions_EditionDefault_has_edition(const go UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_value(google_protobuf_FieldOptions_EditionDefault *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FieldOptions_EditionDefault_set_edition(google_protobuf_FieldOptions_EditionDefault *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 65, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} + +/* google.protobuf.FieldOptions.FeatureSupport */ + +UPB_INLINE google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_FeatureSupport_new(upb_Arena* arena) { + return (google_protobuf_FieldOptions_FeatureSupport*)_upb_Message_New(&google__protobuf__FieldOptions__FeatureSupport_msg_init, arena); +} +UPB_INLINE google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_FeatureSupport_parse(const char* buf, size_t size, upb_Arena* arena) { + google_protobuf_FieldOptions_FeatureSupport* ret = google_protobuf_FieldOptions_FeatureSupport_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &google__protobuf__FieldOptions__FeatureSupport_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE google_protobuf_FieldOptions_FeatureSupport* google_protobuf_FieldOptions_FeatureSupport_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + google_protobuf_FieldOptions_FeatureSupport* ret = google_protobuf_FieldOptions_FeatureSupport_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &google__protobuf__FieldOptions__FeatureSupport_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* google_protobuf_FieldOptions_FeatureSupport_serialize(const google_protobuf_FieldOptions_FeatureSupport* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &google__protobuf__FieldOptions__FeatureSupport_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* google_protobuf_FieldOptions_FeatureSupport_serialize_ex(const google_protobuf_FieldOptions_FeatureSupport* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &google__protobuf__FieldOptions__FeatureSupport_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_clear_edition_introduced(google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t google_protobuf_FieldOptions_FeatureSupport_edition_introduced(const google_protobuf_FieldOptions_FeatureSupport* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_FeatureSupport_has_edition_introduced(const google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_clear_edition_deprecated(google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t google_protobuf_FieldOptions_FeatureSupport_edition_deprecated(const google_protobuf_FieldOptions_FeatureSupport* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_FeatureSupport_has_edition_deprecated(const google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_clear_deprecation_warning(google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE upb_StringView google_protobuf_FieldOptions_FeatureSupport_deprecation_warning(const google_protobuf_FieldOptions_FeatureSupport* msg) { + upb_StringView default_val = upb_StringView_FromString(""); + upb_StringView ret; + const upb_MiniTableField field = {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_FeatureSupport_has_deprecation_warning(const google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_clear_edition_removed(google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t google_protobuf_FieldOptions_FeatureSupport_edition_removed(const google_protobuf_FieldOptions_FeatureSupport* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FieldOptions_FeatureSupport_has_edition_removed(const google_protobuf_FieldOptions_FeatureSupport* msg) { + const upb_MiniTableField field = {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} + +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_set_edition_introduced(google_protobuf_FieldOptions_FeatureSupport *msg, int32_t value) { + const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_set_edition_deprecated(google_protobuf_FieldOptions_FeatureSupport *msg, int32_t value) { + const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_set_deprecation_warning(google_protobuf_FieldOptions_FeatureSupport *msg, upb_StringView value) { + const upb_MiniTableField field = {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FieldOptions_FeatureSupport_set_edition_removed(google_protobuf_FieldOptions_FeatureSupport *msg, int32_t value) { + const upb_MiniTableField field = {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.OneofOptions */ @@ -4451,7 +4599,7 @@ UPB_INLINE upb_Array* _google_protobuf_OneofOptions_uninterpreted_option_mutable UPB_INLINE void google_protobuf_OneofOptions_set_features(google_protobuf_OneofOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_OneofOptions_mutable_features(google_protobuf_OneofOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_OneofOptions_features(msg); @@ -4627,19 +4775,19 @@ UPB_INLINE upb_Array* _google_protobuf_EnumOptions_uninterpreted_option_mutable_ UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = {2, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = {3, 10, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_deprecated_legacy_json_field_conflicts(google_protobuf_EnumOptions *msg, bool value) { const upb_MiniTableField field = {6, 11, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumOptions_set_features(google_protobuf_EnumOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {7, UPB_SIZE(12, 16), 67, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumOptions_mutable_features(google_protobuf_EnumOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumOptions_features(msg); @@ -4764,12 +4912,28 @@ UPB_INLINE bool google_protobuf_EnumValueOptions_has_debug_redact(const google_p const upb_MiniTableField field = {3, UPB_SIZE(16, 10), 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } +UPB_INLINE void google_protobuf_EnumValueOptions_clear_feature_support(google_protobuf_EnumValueOptions* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE const google_protobuf_FieldOptions_FeatureSupport* google_protobuf_EnumValueOptions_feature_support(const google_protobuf_EnumValueOptions* msg) { + const google_protobuf_FieldOptions_FeatureSupport* default_val = NULL; + const google_protobuf_FieldOptions_FeatureSupport* ret; + const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_EnumValueOptions_has_feature_support(const google_protobuf_EnumValueOptions* msg) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(google_protobuf_EnumValueOptions* msg) { - const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* size) { - const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4780,7 +4944,7 @@ UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_Enu } } UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_upb_array(const google_protobuf_EnumValueOptions* msg, size_t* size) { - const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; const upb_Array* arr = upb_Message_GetArray(UPB_UPCAST(msg), &field); if (size) { *size = arr ? arr->UPB_PRIVATE(size) : 0; @@ -4788,7 +4952,7 @@ UPB_INLINE const upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_opti return arr; } UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mutable_upb_array(google_protobuf_EnumValueOptions* msg, size_t* size, upb_Arena* arena) { - const upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray(UPB_UPCAST(msg), &field, arena); if (size) { @@ -4799,11 +4963,11 @@ UPB_INLINE upb_Array* _google_protobuf_EnumValueOptions_uninterpreted_option_mut UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_EnumValueOptions_set_features(google_protobuf_EnumValueOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_mutable_features(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_EnumValueOptions_features(msg); @@ -4815,10 +4979,22 @@ UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_EnumValueOptions_m } UPB_INLINE void google_protobuf_EnumValueOptions_set_debug_redact(google_protobuf_EnumValueOptions *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 10), 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_EnumValueOptions_set_feature_support(google_protobuf_EnumValueOptions *msg, google_protobuf_FieldOptions_FeatureSupport* value) { + const upb_MiniTableField field = {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_FieldOptions_FeatureSupport* google_protobuf_EnumValueOptions_mutable_feature_support(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) { + struct google_protobuf_FieldOptions_FeatureSupport* sub = (struct google_protobuf_FieldOptions_FeatureSupport*)google_protobuf_EnumValueOptions_feature_support(msg); + if (sub == NULL) { + sub = (struct google_protobuf_FieldOptions_FeatureSupport*)_upb_Message_New(&google__protobuf__FieldOptions__FeatureSupport_msg_init, arena); + if (sub) google_protobuf_EnumValueOptions_set_feature_support(msg, sub); + } + return sub; } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* size) { - upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetMutableArray(UPB_UPCAST(msg), &field); if (arr) { if (size) *size = arr->UPB_PRIVATE(size); @@ -4829,12 +5005,12 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOption } } UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t size, upb_Arena* arena) { - upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArrayUninitialized(UPB_UPCAST(msg), &field, size, arena); } UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) { - upb_MiniTableField field = {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_MiniTableField field = {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Array* arr = upb_Message_GetOrCreateMutableArray( UPB_UPCAST(msg), &field, arena); if (!arr || !UPB_PRIVATE(_upb_Array_ResizeUninitialized)( @@ -4951,11 +5127,11 @@ UPB_INLINE upb_Array* _google_protobuf_ServiceOptions_uninterpreted_option_mutab UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) { const upb_MiniTableField field = {33, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_ServiceOptions_set_features(google_protobuf_ServiceOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {34, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_ServiceOptions_mutable_features(google_protobuf_ServiceOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_ServiceOptions_features(msg); @@ -5115,15 +5291,15 @@ UPB_INLINE upb_Array* _google_protobuf_MethodOptions_uninterpreted_option_mutabl UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) { const upb_MiniTableField field = {33, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) { const upb_MiniTableField field = {34, 12, 65, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_MethodOptions_set_features(google_protobuf_MethodOptions *msg, google_protobuf_FeatureSet* value) { const upb_MiniTableField field = {35, 16, 66, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_MethodOptions_mutable_features(google_protobuf_MethodOptions* msg, upb_Arena* arena) { struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_MethodOptions_features(msg); @@ -5361,27 +5537,27 @@ UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_ } UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(24, 40), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(32, 48), 66, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) { const upb_MiniTableField field = {6, UPB_SIZE(40, 56), 67, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(48, 64), 68, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(56, 80), 69, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.UninterpretedOption.NamePart */ @@ -5455,11 +5631,11 @@ UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(co UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) { const upb_MiniTableField field = {2, 9, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSet */ @@ -5597,27 +5773,27 @@ UPB_INLINE bool google_protobuf_FeatureSet_has_json_format(const google_protobuf UPB_INLINE void google_protobuf_FeatureSet_set_field_presence(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_enum_type(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_repeated_field_encoding(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {3, 20, 66, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_utf8_validation(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {4, 24, 67, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_message_encoding(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {5, 28, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSet_set_json_format(google_protobuf_FeatureSet *msg, int32_t value) { const upb_MiniTableField field = {6, 32, 69, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSetDefaults */ @@ -5753,11 +5929,11 @@ UPB_INLINE struct google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* g } UPB_INLINE void google_protobuf_FeatureSetDefaults_set_minimum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(16, 12), 64, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_FeatureSetDefaults_set_maximum_edition(google_protobuf_FeatureSetDefaults *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 16), 65, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault */ @@ -5796,54 +5972,82 @@ UPB_INLINE char* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_ser (void)upb_Encode(UPB_UPCAST(msg), &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init, options, arena, &ptr, len); return ptr; } -UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + int32_t default_val = 0; + int32_t ret; + const upb_MiniTableField field = {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); +} +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } -UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { +UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_overridable_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { const google_protobuf_FeatureSet* default_val = NULL; const google_protobuf_FeatureSet* ret; - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + const upb_MiniTableField field = {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } -UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; +UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_overridable_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } -UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_clear_fixed_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; upb_Message_ClearBaseField(UPB_UPCAST(msg), &field); } -UPB_INLINE int32_t google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - int32_t default_val = 0; - int32_t ret; - const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; +UPB_INLINE const google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_fixed_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const google_protobuf_FeatureSet* default_val = NULL; + const google_protobuf_FeatureSet* ret; + const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, &default_val, &ret); return ret; } -UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_edition(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { - const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; +UPB_INLINE bool google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_has_fixed_features(const google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; return upb_Message_HasBaseField(UPB_UPCAST(msg), &field); } -UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) { - const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, int32_t value) { + const upb_MiniTableField field = {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) { + const upb_MiniTableField field = {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } -UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { - struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_features(msg); +UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_overridable_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { + struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_overridable_features(msg); if (sub == NULL) { sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena); - if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_features(msg, sub); + if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_overridable_features(msg, sub); } return sub; } -UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_edition(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, int32_t value) { - const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); +UPB_INLINE void google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_fixed_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault *msg, google_protobuf_FeatureSet* value) { + const upb_MiniTableField field = {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct google_protobuf_FeatureSet* google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_mutable_fixed_features(google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault* msg, upb_Arena* arena) { + struct google_protobuf_FeatureSet* sub = (struct google_protobuf_FeatureSet*)google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_fixed_features(msg); + if (sub == NULL) { + sub = (struct google_protobuf_FeatureSet*)_upb_Message_New(&google__protobuf__FeatureSet_msg_init, arena); + if (sub) google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_set_fixed_features(msg, sub); + } + return sub; } /* google.protobuf.SourceCodeInfo */ @@ -6169,11 +6373,11 @@ UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 32), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(32, 48), 65, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(20, 64), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -6467,19 +6671,19 @@ UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_pro } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(28, 32), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 12), 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 16), 66, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 20), 67, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* Max size 32 is google.protobuf.FileOptions */ diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c index 3625687c80..9bd32e1087 100644 --- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { &google_protobuf_FileDescriptorSet_submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FileDescriptorSet", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max192b}, @@ -60,6 +63,9 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { &google_protobuf_FileDescriptorProto_submsgs[0], &google_protobuf_FileDescriptorProto__fields[0], UPB_SIZE(80, 136), 13, kUpb_ExtMode_NonExtendable, 12, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FileDescriptorProto", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -108,6 +114,9 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { &google_protobuf_DescriptorProto_submsgs[0], &google_protobuf_DescriptorProto__fields[0], UPB_SIZE(56, 104), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.DescriptorProto", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -142,6 +151,9 @@ const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.DescriptorProto.ExtensionRange", +#endif }; static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = { @@ -153,6 +165,9 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = NULL, &google_protobuf_DescriptorProto_ReservedRange__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.DescriptorProto.ReservedRange", +#endif }; static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[4] = { @@ -173,6 +188,9 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { &google_protobuf_ExtensionRangeOptions_submsgs[0], &google_protobuf_ExtensionRangeOptions__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ExtensionRangeOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -221,6 +239,9 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini NULL, &google_protobuf_ExtensionRangeOptions_Declaration__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ExtensionRangeOptions.Declaration", +#endif }; static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = { @@ -247,6 +268,9 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { &google_protobuf_FieldDescriptorProto_submsgs[0], &google_protobuf_FieldDescriptorProto__fields[0], UPB_SIZE(80, 120), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FieldDescriptorProto", +#endif }; static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = { @@ -262,6 +286,9 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { &google_protobuf_OneofDescriptorProto_submsgs[0], &google_protobuf_OneofDescriptorProto__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.OneofDescriptorProto", +#endif }; static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = { @@ -282,6 +309,9 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { &google_protobuf_EnumDescriptorProto_submsgs[0], &google_protobuf_EnumDescriptorProto__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumDescriptorProto", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -303,6 +333,9 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg NULL, &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumDescriptorProto.EnumReservedRange", +#endif }; static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = { @@ -319,6 +352,9 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { &google_protobuf_EnumValueDescriptorProto_submsgs[0], &google_protobuf_EnumValueDescriptorProto__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumValueDescriptorProto", +#endif }; static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = { @@ -336,6 +372,9 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { &google_protobuf_ServiceDescriptorProto_submsgs[0], &google_protobuf_ServiceDescriptorProto__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ServiceDescriptorProto", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -361,6 +400,9 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { &google_protobuf_MethodDescriptorProto_submsgs[0], &google_protobuf_MethodDescriptorProto__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.MethodDescriptorProto", +#endif }; static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[3] = { @@ -397,6 +439,9 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { &google_protobuf_FileOptions_submsgs[0], &google_protobuf_FileOptions__fields[0], UPB_SIZE(112, 200), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FileOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -452,6 +497,9 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { &google_protobuf_MessageOptions_submsgs[0], &google_protobuf_MessageOptions__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.MessageOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -488,9 +536,10 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = { +static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, @@ -498,26 +547,30 @@ static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[7] = { {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init}, }; -static const upb_MiniTableField google_protobuf_FieldOptions__fields[13] = { - {1, 12, 64, 3, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { + {1, 12, 64, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {2, 16, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {3, 17, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {5, 18, 67, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {6, 20, 68, 4, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {6, 20, 68, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, {10, 24, 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {15, 25, 70, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {16, 26, 71, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {17, 28, 72, 5, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, - {19, 32, 0, 6, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {17, 28, 72, 6, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {19, 32, 0, 7, 14, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {20, UPB_SIZE(36, 40), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {21, UPB_SIZE(40, 48), 73, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {999, UPB_SIZE(44, 56), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {22, UPB_SIZE(44, 56), 74, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {999, UPB_SIZE(48, 64), 0, 3, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__protobuf__FieldOptions_msg_init = { &google_protobuf_FieldOptions_submsgs[0], &google_protobuf_FieldOptions__fields[0], - UPB_SIZE(48, 64), 13, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FieldOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -542,7 +595,7 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { {0x002800003f0001a2, &upb_prm_2bt_max64b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x003800003f023eba, &upb_prm_2bt_max128b}, + {0x004000003f033eba, &upb_prm_2bt_max128b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -567,6 +620,31 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { &google_protobuf_FieldOptions_EditionDefault_submsgs[0], &google_protobuf_FieldOptions_EditionDefault__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FieldOptions.EditionDefault", +#endif +}; + +static const upb_MiniTableSub google_protobuf_FieldOptions_FeatureSupport_submsgs[3] = { + {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +}; + +static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fields[4] = { + {1, 12, 64, 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {2, 16, 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {3, 24, 66, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, 20, 67, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { + &google_protobuf_FieldOptions_FeatureSupport_submsgs[0], + &google_protobuf_FieldOptions_FeatureSupport__fields[0], + UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FieldOptions.FeatureSupport", +#endif }; static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[2] = { @@ -583,6 +661,9 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { &google_protobuf_OneofOptions_submsgs[0], &google_protobuf_OneofOptions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.OneofOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -636,6 +717,9 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { &google_protobuf_EnumOptions_submsgs[0], &google_protobuf_EnumOptions__fields[0], UPB_SIZE(24, 32), 5, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -672,22 +756,27 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }) }; -static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[2] = { +static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, + {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init}, }; -static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[4] = { +static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, {2, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, {3, UPB_SIZE(16, 10), 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}, - {999, UPB_SIZE(20, 24), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(20, 24), 67, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {999, UPB_SIZE(24, 32), 0, 2, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { &google_protobuf_EnumValueOptions_submsgs[0], &google_protobuf_EnumValueOptions__fields[0], - UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, + UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.EnumValueOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -712,7 +801,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, - {0x001800003f013eba, &upb_prm_2bt_max128b}, + {0x002000003f023eba, &upb_prm_2bt_max128b}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -739,6 +828,9 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { &google_protobuf_ServiceOptions_submsgs[0], &google_protobuf_ServiceOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ServiceOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -792,6 +884,9 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { &google_protobuf_MethodOptions_submsgs[0], &google_protobuf_MethodOptions__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.MethodOptions", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -846,6 +941,9 @@ const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { &google_protobuf_UninterpretedOption_submsgs[0], &google_protobuf_UninterpretedOption__fields[0], UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.UninterpretedOption", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -863,6 +961,9 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { NULL, &google_protobuf_UninterpretedOption_NamePart__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 2, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.UninterpretedOption.NamePart", +#endif }; static const upb_MiniTableSub google_protobuf_FeatureSet_submsgs[6] = { @@ -887,6 +988,9 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { &google_protobuf_FeatureSet_submsgs[0], &google_protobuf_FeatureSet__fields[0], 40, 6, kUpb_ExtMode_Extendable, 6, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FeatureSet", +#endif }; static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_submsgs[3] = { @@ -905,26 +1009,34 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { &google_protobuf_FeatureSetDefaults_submsgs[0], &google_protobuf_FeatureSetDefaults__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FeatureSetDefaults", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_prm_1bt_max64b}, }) }; -static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[2] = { +static const upb_MiniTableSub google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { + {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init}, {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, }; -static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[2] = { - {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, - {3, UPB_SIZE(16, 12), 65, 1, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, +static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = { + {3, 12, 64, 2, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}, + {4, 16, 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, + {5, UPB_SIZE(20, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, }; const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = { &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0], &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0], - 24, 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, + UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault", +#endif }; static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = { @@ -939,6 +1051,9 @@ const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { &google_protobuf_SourceCodeInfo_submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.SourceCodeInfo", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max128b}, @@ -957,6 +1072,9 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { NULL, &google_protobuf_SourceCodeInfo_Location__fields[0], UPB_SIZE(40, 72), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.SourceCodeInfo.Location", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_ppv4_1bt}, @@ -981,6 +1099,9 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { &google_protobuf_GeneratedCodeInfo_submsgs[0], &google_protobuf_GeneratedCodeInfo__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.GeneratedCodeInfo", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -1003,13 +1124,16 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0], &google_protobuf_GeneratedCodeInfo_Annotation__fields[0], UPB_SIZE(40, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.GeneratedCodeInfo.Annotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001800003f00000a, &upb_ppv4_1bt}, }) }; -static const upb_MiniTable *messages_layout[32] = { +static const upb_MiniTable *messages_layout[33] = { &google__protobuf__FileDescriptorSet_msg_init, &google__protobuf__FileDescriptorProto_msg_init, &google__protobuf__DescriptorProto_msg_init, @@ -1028,6 +1152,7 @@ static const upb_MiniTable *messages_layout[32] = { &google__protobuf__MessageOptions_msg_init, &google__protobuf__FieldOptions_msg_init, &google__protobuf__FieldOptions__EditionDefault_msg_init, + &google__protobuf__FieldOptions__FeatureSupport_msg_init, &google__protobuf__OneofOptions_msg_init, &google__protobuf__EnumOptions_msg_init, &google__protobuf__EnumValueOptions_msg_init, @@ -1046,10 +1171,11 @@ static const upb_MiniTable *messages_layout[32] = { const upb_MiniTableEnum google_protobuf_Edition_enum_init = { 64, - 8, + 9, { 0x7, 0x0, + 0x384, 0x3e6, 0x3e7, 0x3e8, @@ -1229,7 +1355,7 @@ const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { messages_layout, enums_layout, NULL, - 32, + 33, 17, 0, }; diff --git a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h index 8416e9a4f5..f48a64df65 100644 --- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.h @@ -35,6 +35,7 @@ extern const upb_MiniTable google__protobuf__FileOptions_msg_init; extern const upb_MiniTable google__protobuf__MessageOptions_msg_init; extern const upb_MiniTable google__protobuf__FieldOptions_msg_init; extern const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init; +extern const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init; extern const upb_MiniTable google__protobuf__OneofOptions_msg_init; extern const upb_MiniTable google__protobuf__EnumOptions_msg_init; extern const upb_MiniTable google__protobuf__EnumValueOptions_msg_init; diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb.h b/src/core/ext/upb-gen/google/protobuf/duration.upb.h index 7046399e75..87c825cccf 100644 --- a/src/core/ext/upb-gen/google/protobuf/duration.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/duration.upb.h @@ -86,11 +86,11 @@ UPB_INLINE int32_t google_protobuf_Duration_nanos(const google_protobuf_Duration UPB_INLINE void google_protobuf_Duration_set_seconds(google_protobuf_Duration *msg, int64_t value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Duration_set_nanos(google_protobuf_Duration *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c index 97952deede..75ac19d03a 100644 --- a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable google__protobuf__Duration_msg_init = { NULL, &google_protobuf_Duration__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Duration", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c index aa6071564e..89c53e4fd8 100644 --- a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.c @@ -16,6 +16,9 @@ const upb_MiniTable google__protobuf__Empty_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Empty", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb.h b/src/core/ext/upb-gen/google/protobuf/struct.upb.h index f629f7e268..19b51848dd 100644 --- a/src/core/ext/upb-gen/google/protobuf/struct.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/struct.upb.h @@ -292,23 +292,23 @@ UPB_INLINE bool google_protobuf_Value_has_list_value(const google_protobuf_Value UPB_INLINE void google_protobuf_Value_set_null_value(google_protobuf_Value *msg, int32_t value) { const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Value_set_number_value(google_protobuf_Value *msg, double value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Value_set_string_value(google_protobuf_Value *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Value_set_bool_value(google_protobuf_Value *msg, bool value) { const upb_MiniTableField field = {4, 16, -9, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Value_set_struct_value(google_protobuf_Value *msg, google_protobuf_Struct* value) { const upb_MiniTableField field = {5, 16, -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* google_protobuf_Value_mutable_struct_value(google_protobuf_Value* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)google_protobuf_Value_struct_value(msg); @@ -320,7 +320,7 @@ UPB_INLINE struct google_protobuf_Struct* google_protobuf_Value_mutable_struct_v } UPB_INLINE void google_protobuf_Value_set_list_value(google_protobuf_Value *msg, google_protobuf_ListValue* value) { const upb_MiniTableField field = {6, 16, -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_ListValue* google_protobuf_Value_mutable_list_value(google_protobuf_Value* msg, upb_Arena* arena) { struct google_protobuf_ListValue* sub = (struct google_protobuf_ListValue*)google_protobuf_Value_list_value(msg); diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c index 078c291bab..514d9755bd 100644 --- a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.c @@ -24,6 +24,9 @@ const upb_MiniTable google__protobuf__Struct_msg_init = { &google_protobuf_Struct_submsgs[0], &google_protobuf_Struct__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Struct", +#endif }; static const upb_MiniTableSub google_protobuf_Struct_FieldsEntry_submsgs[1] = { @@ -39,6 +42,9 @@ const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init = { &google_protobuf_Struct_FieldsEntry_submsgs[0], &google_protobuf_Struct_FieldsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Struct.FieldsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -63,6 +69,9 @@ const upb_MiniTable google__protobuf__Value_msg_init = { &google_protobuf_Value_submsgs[0], &google_protobuf_Value__fields[0], UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000801000008, &upb_pov4_1bt}, @@ -87,6 +96,9 @@ const upb_MiniTable google__protobuf__ListValue_msg_init = { &google_protobuf_ListValue_submsgs[0], &google_protobuf_ListValue__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.ListValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h index d4963be729..9ac16177dc 100644 --- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h @@ -86,11 +86,11 @@ UPB_INLINE int32_t google_protobuf_Timestamp_nanos(const google_protobuf_Timesta UPB_INLINE void google_protobuf_Timestamp_set_seconds(google_protobuf_Timestamp *msg, int64_t value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_protobuf_Timestamp_set_nanos(google_protobuf_Timestamp *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c index 76fd9c1e48..c18cf11f95 100644 --- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable google__protobuf__Timestamp_msg_init = { NULL, &google_protobuf_Timestamp__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Timestamp", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv8_1bt}, diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h index 2b1e7dc48a..d31a8e4d4c 100644 --- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h @@ -82,7 +82,7 @@ UPB_INLINE double google_protobuf_DoubleValue_value(const google_protobuf_Double UPB_INLINE void google_protobuf_DoubleValue_set_value(google_protobuf_DoubleValue *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.FloatValue */ @@ -136,7 +136,7 @@ UPB_INLINE float google_protobuf_FloatValue_value(const google_protobuf_FloatVal UPB_INLINE void google_protobuf_FloatValue_set_value(google_protobuf_FloatValue *msg, float value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.Int64Value */ @@ -190,7 +190,7 @@ UPB_INLINE int64_t google_protobuf_Int64Value_value(const google_protobuf_Int64V UPB_INLINE void google_protobuf_Int64Value_set_value(google_protobuf_Int64Value *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.UInt64Value */ @@ -244,7 +244,7 @@ UPB_INLINE uint64_t google_protobuf_UInt64Value_value(const google_protobuf_UInt UPB_INLINE void google_protobuf_UInt64Value_set_value(google_protobuf_UInt64Value *msg, uint64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.Int32Value */ @@ -298,7 +298,7 @@ UPB_INLINE int32_t google_protobuf_Int32Value_value(const google_protobuf_Int32V UPB_INLINE void google_protobuf_Int32Value_set_value(google_protobuf_Int32Value *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.UInt32Value */ @@ -352,7 +352,7 @@ UPB_INLINE uint32_t google_protobuf_UInt32Value_value(const google_protobuf_UInt UPB_INLINE void google_protobuf_UInt32Value_set_value(google_protobuf_UInt32Value *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.BoolValue */ @@ -406,7 +406,7 @@ UPB_INLINE bool google_protobuf_BoolValue_value(const google_protobuf_BoolValue* UPB_INLINE void google_protobuf_BoolValue_set_value(google_protobuf_BoolValue *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.StringValue */ @@ -460,7 +460,7 @@ UPB_INLINE upb_StringView google_protobuf_StringValue_value(const google_protobu UPB_INLINE void google_protobuf_StringValue_set_value(google_protobuf_StringValue *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* google.protobuf.BytesValue */ @@ -514,7 +514,7 @@ UPB_INLINE upb_StringView google_protobuf_BytesValue_value(const google_protobuf UPB_INLINE void google_protobuf_BytesValue_set_value(google_protobuf_BytesValue *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c index a2757bc23f..57a4aa7504 100644 --- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c +++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.c @@ -20,6 +20,9 @@ const upb_MiniTable google__protobuf__DoubleValue_msg_init = { NULL, &google_protobuf_DoubleValue__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.DoubleValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -34,6 +37,9 @@ const upb_MiniTable google__protobuf__FloatValue_msg_init = { NULL, &google_protobuf_FloatValue__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.FloatValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000d, &upb_psf4_1bt}, @@ -48,6 +54,9 @@ const upb_MiniTable google__protobuf__Int64Value_msg_init = { NULL, &google_protobuf_Int64Value__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Int64Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -62,6 +71,9 @@ const upb_MiniTable google__protobuf__UInt64Value_msg_init = { NULL, &google_protobuf_UInt64Value__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.UInt64Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -76,6 +88,9 @@ const upb_MiniTable google__protobuf__Int32Value_msg_init = { NULL, &google_protobuf_Int32Value__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.Int32Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -90,6 +105,9 @@ const upb_MiniTable google__protobuf__UInt32Value_msg_init = { NULL, &google_protobuf_UInt32Value__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.UInt32Value", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -104,6 +122,9 @@ const upb_MiniTable google__protobuf__BoolValue_msg_init = { NULL, &google_protobuf_BoolValue__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.BoolValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -118,6 +139,9 @@ const upb_MiniTable google__protobuf__StringValue_msg_init = { NULL, &google_protobuf_StringValue__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.StringValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -132,6 +156,9 @@ const upb_MiniTable google__protobuf__BytesValue_msg_init = { NULL, &google_protobuf_BytesValue__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "google.protobuf.BytesValue", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_psb_1bt}, diff --git a/src/core/ext/upb-gen/google/rpc/status.upb.h b/src/core/ext/upb-gen/google/rpc/status.upb.h index ba5f9d4a26..6c435f4f68 100644 --- a/src/core/ext/upb-gen/google/rpc/status.upb.h +++ b/src/core/ext/upb-gen/google/rpc/status.upb.h @@ -121,11 +121,11 @@ UPB_INLINE upb_Array* _google_rpc_Status_details_mutable_upb_array(google_rpc_St UPB_INLINE void google_rpc_Status_set_code(google_rpc_Status *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void google_rpc_Status_set_message(google_rpc_Status *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any** google_rpc_Status_mutable_details(google_rpc_Status* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c index 2eae96c681..9db3b29015 100644 --- a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c +++ b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable google__rpc__Status_msg_init = { &google_rpc_Status_submsgs[0], &google_rpc_Status__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "google.rpc.Status", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h index 66c95198e5..ab7f12d207 100644 --- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h +++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb.h @@ -178,7 +178,7 @@ UPB_INLINE int64_t opencensus_proto_trace_v1_TraceConfig_max_number_of_links(con UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_probability_sampler(opencensus_proto_trace_v1_TraceConfig *msg, opencensus_proto_trace_v1_ProbabilitySampler* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 48), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto_trace_v1_TraceConfig_mutable_probability_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) { struct opencensus_proto_trace_v1_ProbabilitySampler* sub = (struct opencensus_proto_trace_v1_ProbabilitySampler*)opencensus_proto_trace_v1_TraceConfig_probability_sampler(msg); @@ -190,7 +190,7 @@ UPB_INLINE struct opencensus_proto_trace_v1_ProbabilitySampler* opencensus_proto } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_constant_sampler(opencensus_proto_trace_v1_TraceConfig *msg, opencensus_proto_trace_v1_ConstantSampler* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 48), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_trace_v1_TraceConfig_mutable_constant_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) { struct opencensus_proto_trace_v1_ConstantSampler* sub = (struct opencensus_proto_trace_v1_ConstantSampler*)opencensus_proto_trace_v1_TraceConfig_constant_sampler(msg); @@ -202,7 +202,7 @@ UPB_INLINE struct opencensus_proto_trace_v1_ConstantSampler* opencensus_proto_tr } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_rate_limiting_sampler(opencensus_proto_trace_v1_TraceConfig *msg, opencensus_proto_trace_v1_RateLimitingSampler* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct opencensus_proto_trace_v1_RateLimitingSampler* opencensus_proto_trace_v1_TraceConfig_mutable_rate_limiting_sampler(opencensus_proto_trace_v1_TraceConfig* msg, upb_Arena* arena) { struct opencensus_proto_trace_v1_RateLimitingSampler* sub = (struct opencensus_proto_trace_v1_RateLimitingSampler*)opencensus_proto_trace_v1_TraceConfig_rate_limiting_sampler(msg); @@ -214,19 +214,19 @@ UPB_INLINE struct opencensus_proto_trace_v1_RateLimitingSampler* opencensus_prot } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_attributes(opencensus_proto_trace_v1_TraceConfig *msg, int64_t value) { const upb_MiniTableField field = {4, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_annotations(opencensus_proto_trace_v1_TraceConfig *msg, int64_t value) { const upb_MiniTableField field = {5, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_message_events(opencensus_proto_trace_v1_TraceConfig *msg, int64_t value) { const upb_MiniTableField field = {6, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void opencensus_proto_trace_v1_TraceConfig_set_max_number_of_links(opencensus_proto_trace_v1_TraceConfig *msg, int64_t value) { const upb_MiniTableField field = {7, 40, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* opencensus.proto.trace.v1.ProbabilitySampler */ @@ -280,7 +280,7 @@ UPB_INLINE double opencensus_proto_trace_v1_ProbabilitySampler_samplingProbabili UPB_INLINE void opencensus_proto_trace_v1_ProbabilitySampler_set_samplingProbability(opencensus_proto_trace_v1_ProbabilitySampler *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* opencensus.proto.trace.v1.ConstantSampler */ @@ -334,7 +334,7 @@ UPB_INLINE int32_t opencensus_proto_trace_v1_ConstantSampler_decision(const open UPB_INLINE void opencensus_proto_trace_v1_ConstantSampler_set_decision(opencensus_proto_trace_v1_ConstantSampler *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* opencensus.proto.trace.v1.RateLimitingSampler */ @@ -388,7 +388,7 @@ UPB_INLINE int64_t opencensus_proto_trace_v1_RateLimitingSampler_qps(const openc UPB_INLINE void opencensus_proto_trace_v1_RateLimitingSampler_set_qps(opencensus_proto_trace_v1_RateLimitingSampler *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c index cc1720d44d..7b7e5abba3 100644 --- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c +++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable opencensus__proto__trace__v1__TraceConfig_msg_init = { &opencensus_proto_trace_v1_TraceConfig_submsgs[0], &opencensus_proto_trace_v1_TraceConfig__fields[0], UPB_SIZE(48, 56), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "opencensus.proto.trace.v1.TraceConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x003000080100000a, &upb_pom_1bt_max64b}, @@ -52,6 +55,9 @@ const upb_MiniTable opencensus__proto__trace__v1__ProbabilitySampler_msg_init = NULL, &opencensus_proto_trace_v1_ProbabilitySampler__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "opencensus.proto.trace.v1.ProbabilitySampler", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -66,6 +72,9 @@ const upb_MiniTable opencensus__proto__trace__v1__ConstantSampler_msg_init = { NULL, &opencensus_proto_trace_v1_ConstantSampler__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "opencensus.proto.trace.v1.ConstantSampler", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -80,6 +89,9 @@ const upb_MiniTable opencensus__proto__trace__v1__RateLimitingSampler_msg_init = NULL, &opencensus_proto_trace_v1_RateLimitingSampler__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "opencensus.proto.trace.v1.RateLimitingSampler", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h index b6e7b7208e..8f872c430c 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h @@ -171,27 +171,27 @@ UPB_INLINE upb_Map* _grpc_gcp_AltsContext_peer_attributes_mutable_upb_map(grpc_g UPB_INLINE void grpc_gcp_AltsContext_set_application_protocol(grpc_gcp_AltsContext *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_record_protocol(grpc_gcp_AltsContext *msg, upb_StringView value) { const upb_MiniTableField field = {2, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_security_level(grpc_gcp_AltsContext *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_peer_service_account(grpc_gcp_AltsContext *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_local_service_account(grpc_gcp_AltsContext *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(48, 64), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_AltsContext_set_peer_rpc_versions(grpc_gcp_AltsContext *msg, struct grpc_gcp_RpcProtocolVersions* value) { const upb_MiniTableField field = {6, UPB_SIZE(16, 80), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_AltsContext_mutable_peer_rpc_versions(grpc_gcp_AltsContext* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_AltsContext_peer_rpc_versions(msg); diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c index 6691198110..ebc0fdc746 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable grpc__gcp__AltsContext_msg_init = { &grpc_gcp_AltsContext_submsgs[0], &grpc_gcp_AltsContext__fields[0], UPB_SIZE(56, 96), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.AltsContext", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -53,6 +56,9 @@ const upb_MiniTable grpc__gcp__AltsContext__PeerAttributesEntry_msg_init = { NULL, &grpc_gcp_AltsContext_PeerAttributesEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.AltsContext.PeerAttributesEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h index e88e4b3617..cdfb19f47f 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h @@ -124,15 +124,15 @@ UPB_INLINE int32_t grpc_gcp_Endpoint_protocol(const grpc_gcp_Endpoint* msg) { UPB_INLINE void grpc_gcp_Endpoint_set_ip_address(grpc_gcp_Endpoint *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_Endpoint_set_port(grpc_gcp_Endpoint *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_Endpoint_set_protocol(grpc_gcp_Endpoint *msg, int32_t value) { const upb_MiniTableField field = {3, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.Identity */ @@ -245,11 +245,11 @@ UPB_INLINE upb_Map* _grpc_gcp_Identity_attributes_mutable_upb_map(grpc_gcp_Ident UPB_INLINE void grpc_gcp_Identity_set_service_account(grpc_gcp_Identity *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_Identity_set_hostname(grpc_gcp_Identity *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_Identity_attributes_clear(grpc_gcp_Identity* msg) { const upb_MiniTableField field = {3, UPB_SIZE(12, 32), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -529,7 +529,7 @@ UPB_INLINE uint32_t grpc_gcp_StartClientHandshakeReq_max_frame_size(const grpc_g UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_handshake_security_protocol(grpc_gcp_StartClientHandshakeReq *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* grpc_gcp_StartClientHandshakeReq_mutable_application_protocols(grpc_gcp_StartClientHandshakeReq* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -619,7 +619,7 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_add_target } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_local_identity(grpc_gcp_StartClientHandshakeReq *msg, grpc_gcp_Identity* value) { const upb_MiniTableField field = {5, UPB_SIZE(28, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_mutable_local_identity(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_StartClientHandshakeReq_local_identity(msg); @@ -631,7 +631,7 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_StartClientHandshakeReq_mutable_lo } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_local_endpoint(grpc_gcp_StartClientHandshakeReq *msg, grpc_gcp_Endpoint* value) { const upb_MiniTableField field = {6, UPB_SIZE(32, 56), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_local_endpoint(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartClientHandshakeReq_local_endpoint(msg); @@ -643,7 +643,7 @@ UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_lo } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_remote_endpoint(grpc_gcp_StartClientHandshakeReq *msg, grpc_gcp_Endpoint* value) { const upb_MiniTableField field = {7, UPB_SIZE(36, 64), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_remote_endpoint(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartClientHandshakeReq_remote_endpoint(msg); @@ -655,11 +655,11 @@ UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartClientHandshakeReq_mutable_re } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_target_name(grpc_gcp_StartClientHandshakeReq *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(48, 72), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_rpc_versions(grpc_gcp_StartClientHandshakeReq *msg, struct grpc_gcp_RpcProtocolVersions* value) { const upb_MiniTableField field = {9, UPB_SIZE(40, 88), 67, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartClientHandshakeReq_mutable_rpc_versions(grpc_gcp_StartClientHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_StartClientHandshakeReq_rpc_versions(msg); @@ -671,7 +671,7 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartClientHandshakeReq } UPB_INLINE void grpc_gcp_StartClientHandshakeReq_set_max_frame_size(grpc_gcp_StartClientHandshakeReq *msg, uint32_t value) { const upb_MiniTableField field = {10, UPB_SIZE(44, 16), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.ServerHandshakeParameters */ @@ -1059,11 +1059,11 @@ UPB_INLINE grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry* grpc_gcp_S } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_in_bytes(grpc_gcp_StartServerHandshakeReq *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(36, 32), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_local_endpoint(grpc_gcp_StartServerHandshakeReq *msg, grpc_gcp_Endpoint* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_local_endpoint(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartServerHandshakeReq_local_endpoint(msg); @@ -1075,7 +1075,7 @@ UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_lo } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_remote_endpoint(grpc_gcp_StartServerHandshakeReq *msg, grpc_gcp_Endpoint* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 65, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_remote_endpoint(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_Endpoint* sub = (struct grpc_gcp_Endpoint*)grpc_gcp_StartServerHandshakeReq_remote_endpoint(msg); @@ -1087,7 +1087,7 @@ UPB_INLINE struct grpc_gcp_Endpoint* grpc_gcp_StartServerHandshakeReq_mutable_re } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_rpc_versions(grpc_gcp_StartServerHandshakeReq *msg, struct grpc_gcp_RpcProtocolVersions* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 66, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartServerHandshakeReq_mutable_rpc_versions(grpc_gcp_StartServerHandshakeReq* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_StartServerHandshakeReq_rpc_versions(msg); @@ -1099,7 +1099,7 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_StartServerHandshakeReq } UPB_INLINE void grpc_gcp_StartServerHandshakeReq_set_max_frame_size(grpc_gcp_StartServerHandshakeReq *msg, uint32_t value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.StartServerHandshakeReq.HandshakeParametersEntry */ @@ -1174,7 +1174,7 @@ UPB_INLINE upb_StringView grpc_gcp_NextHandshakeMessageReq_in_bytes(const grpc_g UPB_INLINE void grpc_gcp_NextHandshakeMessageReq_set_in_bytes(grpc_gcp_NextHandshakeMessageReq *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.HandshakerReq */ @@ -1275,7 +1275,7 @@ UPB_INLINE bool grpc_gcp_HandshakerReq_has_next(const grpc_gcp_HandshakerReq* ms UPB_INLINE void grpc_gcp_HandshakerReq_set_client_start(grpc_gcp_HandshakerReq *msg, grpc_gcp_StartClientHandshakeReq* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_StartClientHandshakeReq* grpc_gcp_HandshakerReq_mutable_client_start(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) { struct grpc_gcp_StartClientHandshakeReq* sub = (struct grpc_gcp_StartClientHandshakeReq*)grpc_gcp_HandshakerReq_client_start(msg); @@ -1287,7 +1287,7 @@ UPB_INLINE struct grpc_gcp_StartClientHandshakeReq* grpc_gcp_HandshakerReq_mutab } UPB_INLINE void grpc_gcp_HandshakerReq_set_server_start(grpc_gcp_HandshakerReq *msg, grpc_gcp_StartServerHandshakeReq* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_StartServerHandshakeReq* grpc_gcp_HandshakerReq_mutable_server_start(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) { struct grpc_gcp_StartServerHandshakeReq* sub = (struct grpc_gcp_StartServerHandshakeReq*)grpc_gcp_HandshakerReq_server_start(msg); @@ -1299,7 +1299,7 @@ UPB_INLINE struct grpc_gcp_StartServerHandshakeReq* grpc_gcp_HandshakerReq_mutab } UPB_INLINE void grpc_gcp_HandshakerReq_set_next(grpc_gcp_HandshakerReq *msg, grpc_gcp_NextHandshakeMessageReq* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_NextHandshakeMessageReq* grpc_gcp_HandshakerReq_mutable_next(grpc_gcp_HandshakerReq* msg, upb_Arena* arena) { struct grpc_gcp_NextHandshakeMessageReq* sub = (struct grpc_gcp_NextHandshakeMessageReq*)grpc_gcp_HandshakerReq_next(msg); @@ -1457,19 +1457,19 @@ UPB_INLINE uint32_t grpc_gcp_HandshakerResult_max_frame_size(const grpc_gcp_Hand UPB_INLINE void grpc_gcp_HandshakerResult_set_application_protocol(grpc_gcp_HandshakerResult *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResult_set_record_protocol(grpc_gcp_HandshakerResult *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(40, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResult_set_key_data(grpc_gcp_HandshakerResult *msg, upb_StringView value) { const upb_MiniTableField field = {3, 48, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResult_set_peer_identity(grpc_gcp_HandshakerResult *msg, grpc_gcp_Identity* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_peer_identity(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) { struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_HandshakerResult_peer_identity(msg); @@ -1481,7 +1481,7 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_peer_iden } UPB_INLINE void grpc_gcp_HandshakerResult_set_local_identity(grpc_gcp_HandshakerResult *msg, grpc_gcp_Identity* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 72), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_local_identity(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) { struct grpc_gcp_Identity* sub = (struct grpc_gcp_Identity*)grpc_gcp_HandshakerResult_local_identity(msg); @@ -1493,11 +1493,11 @@ UPB_INLINE struct grpc_gcp_Identity* grpc_gcp_HandshakerResult_mutable_local_ide } UPB_INLINE void grpc_gcp_HandshakerResult_set_keep_channel_open(grpc_gcp_HandshakerResult *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResult_set_peer_rpc_versions(grpc_gcp_HandshakerResult *msg, struct grpc_gcp_RpcProtocolVersions* value) { const upb_MiniTableField field = {7, UPB_SIZE(24, 80), 66, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_HandshakerResult_mutable_peer_rpc_versions(grpc_gcp_HandshakerResult* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions* sub = (struct grpc_gcp_RpcProtocolVersions*)grpc_gcp_HandshakerResult_peer_rpc_versions(msg); @@ -1509,7 +1509,7 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions* grpc_gcp_HandshakerResult_mutabl } UPB_INLINE void grpc_gcp_HandshakerResult_set_max_frame_size(grpc_gcp_HandshakerResult *msg, uint32_t value) { const upb_MiniTableField field = {8, UPB_SIZE(28, 12), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.HandshakerStatus */ @@ -1575,11 +1575,11 @@ UPB_INLINE upb_StringView grpc_gcp_HandshakerStatus_details(const grpc_gcp_Hands UPB_INLINE void grpc_gcp_HandshakerStatus_set_code(grpc_gcp_HandshakerStatus *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerStatus_set_details(grpc_gcp_HandshakerStatus *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.gcp.HandshakerResp */ @@ -1677,15 +1677,15 @@ UPB_INLINE bool grpc_gcp_HandshakerResp_has_status(const grpc_gcp_HandshakerResp UPB_INLINE void grpc_gcp_HandshakerResp_set_out_frames(grpc_gcp_HandshakerResp *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResp_set_bytes_consumed(grpc_gcp_HandshakerResp *msg, uint32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_HandshakerResp_set_result(grpc_gcp_HandshakerResp *msg, grpc_gcp_HandshakerResult* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResp_mutable_result(grpc_gcp_HandshakerResp* msg, upb_Arena* arena) { struct grpc_gcp_HandshakerResult* sub = (struct grpc_gcp_HandshakerResult*)grpc_gcp_HandshakerResp_result(msg); @@ -1697,7 +1697,7 @@ UPB_INLINE struct grpc_gcp_HandshakerResult* grpc_gcp_HandshakerResp_mutable_res } UPB_INLINE void grpc_gcp_HandshakerResp_set_status(grpc_gcp_HandshakerResp *msg, grpc_gcp_HandshakerStatus* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerResp_mutable_status(grpc_gcp_HandshakerResp* msg, upb_Arena* arena) { struct grpc_gcp_HandshakerStatus* sub = (struct grpc_gcp_HandshakerStatus*)grpc_gcp_HandshakerResp_status(msg); diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c index 11373e1ed4..fc1ebd9f43 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable grpc__gcp__Endpoint_msg_init = { NULL, &grpc_gcp_Endpoint__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.Endpoint", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -45,6 +48,9 @@ const upb_MiniTable grpc__gcp__Identity_msg_init = { &grpc_gcp_Identity_submsgs[0], &grpc_gcp_Identity__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.Identity", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pos_1bt}, @@ -62,6 +68,9 @@ const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init = { NULL, &grpc_gcp_Identity_AttributesEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.Identity.AttributesEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -95,6 +104,9 @@ const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = { &grpc_gcp_StartClientHandshakeReq_submsgs[0], &grpc_gcp_StartClientHandshakeReq__fields[0], UPB_SIZE(56, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.StartClientHandshakeReq", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000c00003f000008, &upb_psv4_1bt}, @@ -128,6 +140,9 @@ const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = { &grpc_gcp_ServerHandshakeParameters_submsgs[0], &grpc_gcp_ServerHandshakeParameters__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.ServerHandshakeParameters", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, @@ -157,6 +172,9 @@ const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = { &grpc_gcp_StartServerHandshakeReq_submsgs[0], &grpc_gcp_StartServerHandshakeReq__fields[0], UPB_SIZE(48, 72), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.StartServerHandshakeReq", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prs_1bt}, @@ -182,6 +200,9 @@ const upb_MiniTable grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[0], &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.StartServerHandshakeReq.HandshakeParametersEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f000008, &upb_psv4_1bt}, @@ -196,6 +217,9 @@ const upb_MiniTable grpc__gcp__NextHandshakeMessageReq_msg_init = { NULL, &grpc_gcp_NextHandshakeMessageReq__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.NextHandshakeMessageReq", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_psb_1bt}, @@ -218,6 +242,9 @@ const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = { &grpc_gcp_HandshakerReq_submsgs[0], &grpc_gcp_HandshakerReq__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.HandshakerReq", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max128b}, @@ -247,6 +274,9 @@ const upb_MiniTable grpc__gcp__HandshakerResult_msg_init = { &grpc_gcp_HandshakerResult_submsgs[0], &grpc_gcp_HandshakerResult__fields[0], UPB_SIZE(56, 88), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.HandshakerResult", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -276,6 +306,9 @@ const upb_MiniTable grpc__gcp__HandshakerStatus_msg_init = { NULL, &grpc_gcp_HandshakerStatus__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.HandshakerStatus", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -300,6 +333,9 @@ const upb_MiniTable grpc__gcp__HandshakerResp_msg_init = { &grpc_gcp_HandshakerResp_submsgs[0], &grpc_gcp_HandshakerResp__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.HandshakerResp", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_psb_1bt}, diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h index ce3dd227cf..69ad9dc44f 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h @@ -101,7 +101,7 @@ UPB_INLINE bool grpc_gcp_RpcProtocolVersions_has_min_rpc_version(const grpc_gcp_ UPB_INLINE void grpc_gcp_RpcProtocolVersions_set_max_rpc_version(grpc_gcp_RpcProtocolVersions *msg, grpc_gcp_RpcProtocolVersions_Version* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_mutable_max_rpc_version(grpc_gcp_RpcProtocolVersions* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions_Version* sub = (struct grpc_gcp_RpcProtocolVersions_Version*)grpc_gcp_RpcProtocolVersions_max_rpc_version(msg); @@ -113,7 +113,7 @@ UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVers } UPB_INLINE void grpc_gcp_RpcProtocolVersions_set_min_rpc_version(grpc_gcp_RpcProtocolVersions *msg, grpc_gcp_RpcProtocolVersions_Version* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_gcp_RpcProtocolVersions_Version* grpc_gcp_RpcProtocolVersions_mutable_min_rpc_version(grpc_gcp_RpcProtocolVersions* msg, upb_Arena* arena) { struct grpc_gcp_RpcProtocolVersions_Version* sub = (struct grpc_gcp_RpcProtocolVersions_Version*)grpc_gcp_RpcProtocolVersions_min_rpc_version(msg); @@ -187,11 +187,11 @@ UPB_INLINE uint32_t grpc_gcp_RpcProtocolVersions_Version_minor(const grpc_gcp_Rp UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_set_major(grpc_gcp_RpcProtocolVersions_Version *msg, uint32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_set_minor(grpc_gcp_RpcProtocolVersions_Version *msg, uint32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c index e263e6c6f4..53c3841040 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable grpc__gcp__RpcProtocolVersions_msg_init = { &grpc_gcp_RpcProtocolVersions_submsgs[0], &grpc_gcp_RpcProtocolVersions__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.RpcProtocolVersions", +#endif }; static const upb_MiniTableField grpc_gcp_RpcProtocolVersions_Version__fields[2] = { @@ -37,6 +40,9 @@ const upb_MiniTable grpc__gcp__RpcProtocolVersions__Version_msg_init = { NULL, &grpc_gcp_RpcProtocolVersions_Version__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.gcp.RpcProtocolVersions.Version", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h index 504cd0c12b..30b433376f 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb.h @@ -82,7 +82,7 @@ UPB_INLINE upb_StringView grpc_health_v1_HealthCheckRequest_service(const grpc_h UPB_INLINE void grpc_health_v1_HealthCheckRequest_set_service(grpc_health_v1_HealthCheckRequest *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.health.v1.HealthCheckResponse */ @@ -136,7 +136,7 @@ UPB_INLINE int32_t grpc_health_v1_HealthCheckResponse_status(const grpc_health_v UPB_INLINE void grpc_health_v1_HealthCheckResponse_set_status(grpc_health_v1_HealthCheckResponse *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c index 3524fd2910..e5d5760e4d 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.c @@ -20,6 +20,9 @@ const upb_MiniTable grpc__health__v1__HealthCheckRequest_msg_init = { NULL, &grpc_health_v1_HealthCheckRequest__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.health.v1.HealthCheckRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -34,6 +37,9 @@ const upb_MiniTable grpc__health__v1__HealthCheckResponse_msg_init = { NULL, &grpc_health_v1_HealthCheckResponse__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.health.v1.HealthCheckResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h index 0d311b82eb..2008fd7137 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb.h @@ -117,7 +117,7 @@ UPB_INLINE bool grpc_lb_v1_LoadBalanceRequest_has_client_stats(const grpc_lb_v1_ UPB_INLINE void grpc_lb_v1_LoadBalanceRequest_set_initial_request(grpc_lb_v1_LoadBalanceRequest *msg, grpc_lb_v1_InitialLoadBalanceRequest* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_LoadBalanceRequest_mutable_initial_request(grpc_lb_v1_LoadBalanceRequest* msg, upb_Arena* arena) { struct grpc_lb_v1_InitialLoadBalanceRequest* sub = (struct grpc_lb_v1_InitialLoadBalanceRequest*)grpc_lb_v1_LoadBalanceRequest_initial_request(msg); @@ -129,7 +129,7 @@ UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceRequest* grpc_lb_v1_LoadBalanceRe } UPB_INLINE void grpc_lb_v1_LoadBalanceRequest_set_client_stats(grpc_lb_v1_LoadBalanceRequest *msg, grpc_lb_v1_ClientStats* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_ClientStats* grpc_lb_v1_LoadBalanceRequest_mutable_client_stats(grpc_lb_v1_LoadBalanceRequest* msg, upb_Arena* arena) { struct grpc_lb_v1_ClientStats* sub = (struct grpc_lb_v1_ClientStats*)grpc_lb_v1_LoadBalanceRequest_client_stats(msg); @@ -191,7 +191,7 @@ UPB_INLINE upb_StringView grpc_lb_v1_InitialLoadBalanceRequest_name(const grpc_l UPB_INLINE void grpc_lb_v1_InitialLoadBalanceRequest_set_name(grpc_lb_v1_InitialLoadBalanceRequest *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lb.v1.ClientStatsPerToken */ @@ -257,11 +257,11 @@ UPB_INLINE int64_t grpc_lb_v1_ClientStatsPerToken_num_calls(const grpc_lb_v1_Cli UPB_INLINE void grpc_lb_v1_ClientStatsPerToken_set_load_balance_token(grpc_lb_v1_ClientStatsPerToken *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_ClientStatsPerToken_set_num_calls(grpc_lb_v1_ClientStatsPerToken *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lb.v1.ClientStats */ @@ -399,7 +399,7 @@ UPB_INLINE upb_Array* _grpc_lb_v1_ClientStats_calls_finished_with_drop_mutable_u UPB_INLINE void grpc_lb_v1_ClientStats_set_timestamp(grpc_lb_v1_ClientStats *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* grpc_lb_v1_ClientStats_mutable_timestamp(grpc_lb_v1_ClientStats* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)grpc_lb_v1_ClientStats_timestamp(msg); @@ -411,19 +411,19 @@ UPB_INLINE struct google_protobuf_Timestamp* grpc_lb_v1_ClientStats_mutable_time } UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_started(grpc_lb_v1_ClientStats *msg, int64_t value) { const upb_MiniTableField field = {2, 24, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_finished(grpc_lb_v1_ClientStats *msg, int64_t value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_finished_with_client_failed_to_send(grpc_lb_v1_ClientStats *msg, int64_t value) { const upb_MiniTableField field = {6, 40, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_ClientStats_set_num_calls_finished_known_received(grpc_lb_v1_ClientStats *msg, int64_t value) { const upb_MiniTableField field = {7, 48, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE grpc_lb_v1_ClientStatsPerToken** grpc_lb_v1_ClientStats_mutable_calls_finished_with_drop(grpc_lb_v1_ClientStats* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(16, 56), 0, 1, 11, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -554,7 +554,7 @@ UPB_INLINE bool grpc_lb_v1_LoadBalanceResponse_has_fallback_response(const grpc_ UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_initial_response(grpc_lb_v1_LoadBalanceResponse *msg, grpc_lb_v1_InitialLoadBalanceResponse* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_LoadBalanceResponse_mutable_initial_response(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) { struct grpc_lb_v1_InitialLoadBalanceResponse* sub = (struct grpc_lb_v1_InitialLoadBalanceResponse*)grpc_lb_v1_LoadBalanceResponse_initial_response(msg); @@ -566,7 +566,7 @@ UPB_INLINE struct grpc_lb_v1_InitialLoadBalanceResponse* grpc_lb_v1_LoadBalanceR } UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_server_list(grpc_lb_v1_LoadBalanceResponse *msg, grpc_lb_v1_ServerList* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_ServerList* grpc_lb_v1_LoadBalanceResponse_mutable_server_list(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) { struct grpc_lb_v1_ServerList* sub = (struct grpc_lb_v1_ServerList*)grpc_lb_v1_LoadBalanceResponse_server_list(msg); @@ -578,7 +578,7 @@ UPB_INLINE struct grpc_lb_v1_ServerList* grpc_lb_v1_LoadBalanceResponse_mutable_ } UPB_INLINE void grpc_lb_v1_LoadBalanceResponse_set_fallback_response(grpc_lb_v1_LoadBalanceResponse *msg, grpc_lb_v1_FallbackResponse* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lb_v1_FallbackResponse* grpc_lb_v1_LoadBalanceResponse_mutable_fallback_response(grpc_lb_v1_LoadBalanceResponse* msg, upb_Arena* arena) { struct grpc_lb_v1_FallbackResponse* sub = (struct grpc_lb_v1_FallbackResponse*)grpc_lb_v1_LoadBalanceResponse_fallback_response(msg); @@ -682,7 +682,7 @@ UPB_INLINE bool grpc_lb_v1_InitialLoadBalanceResponse_has_client_stats_report_in UPB_INLINE void grpc_lb_v1_InitialLoadBalanceResponse_set_client_stats_report_interval(grpc_lb_v1_InitialLoadBalanceResponse *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* grpc_lb_v1_InitialLoadBalanceResponse_mutable_client_stats_report_interval(grpc_lb_v1_InitialLoadBalanceResponse* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lb_v1_InitialLoadBalanceResponse_client_stats_report_interval(msg); @@ -880,19 +880,19 @@ UPB_INLINE bool grpc_lb_v1_Server_drop(const grpc_lb_v1_Server* msg) { UPB_INLINE void grpc_lb_v1_Server_set_ip_address(grpc_lb_v1_Server *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_Server_set_port(grpc_lb_v1_Server *msg, int32_t value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_Server_set_load_balance_token(grpc_lb_v1_Server *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lb_v1_Server_set_drop(grpc_lb_v1_Server *msg, bool value) { const upb_MiniTableField field = {4, 12, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c index 79baa883fc..58da640824 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable grpc__lb__v1__LoadBalanceRequest_msg_init = { &grpc_lb_v1_LoadBalanceRequest_submsgs[0], &grpc_lb_v1_LoadBalanceRequest__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.LoadBalanceRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -44,6 +47,9 @@ const upb_MiniTable grpc__lb__v1__InitialLoadBalanceRequest_msg_init = { NULL, &grpc_lb_v1_InitialLoadBalanceRequest__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.InitialLoadBalanceRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -59,6 +65,9 @@ const upb_MiniTable grpc__lb__v1__ClientStatsPerToken_msg_init = { NULL, &grpc_lb_v1_ClientStatsPerToken__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.ClientStatsPerToken", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -85,6 +94,9 @@ const upb_MiniTable grpc__lb__v1__ClientStats_msg_init = { &grpc_lb_v1_ClientStats_submsgs[0], &grpc_lb_v1_ClientStats__fields[0], UPB_SIZE(56, 64), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.ClientStats", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -121,6 +133,9 @@ const upb_MiniTable grpc__lb__v1__LoadBalanceResponse_msg_init = { &grpc_lb_v1_LoadBalanceResponse_submsgs[0], &grpc_lb_v1_LoadBalanceResponse__fields[0], UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.LoadBalanceResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -133,6 +148,9 @@ const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.FallbackResponse", +#endif }; static const upb_MiniTableSub grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = { @@ -147,6 +165,9 @@ const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init = { &grpc_lb_v1_InitialLoadBalanceResponse_submsgs[0], &grpc_lb_v1_InitialLoadBalanceResponse__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.InitialLoadBalanceResponse", +#endif }; static const upb_MiniTableSub grpc_lb_v1_ServerList_submsgs[1] = { @@ -161,6 +182,9 @@ const upb_MiniTable grpc__lb__v1__ServerList_msg_init = { &grpc_lb_v1_ServerList_submsgs[0], &grpc_lb_v1_ServerList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.ServerList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -178,6 +202,9 @@ const upb_MiniTable grpc__lb__v1__Server_msg_init = { NULL, &grpc_lb_v1_Server__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lb.v1.Server", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_psb_1bt}, diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h index af2d5f48b7..d7ca062b2c 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb.h @@ -135,7 +135,7 @@ UPB_INLINE upb_StringView grpc_lookup_v1_RouteLookupRequest_stale_header_data(co UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_set_target_type(grpc_lookup_v1_RouteLookupRequest *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_key_map_clear(grpc_lookup_v1_RouteLookupRequest* msg) { const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -164,11 +164,11 @@ UPB_INLINE grpc_lookup_v1_RouteLookupRequest_KeyMapEntry* grpc_lookup_v1_RouteLo } UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_set_reason(grpc_lookup_v1_RouteLookupRequest *msg, int32_t value) { const upb_MiniTableField field = {5, UPB_SIZE(12, 8), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_RouteLookupRequest_set_stale_header_data(grpc_lookup_v1_RouteLookupRequest *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.RouteLookupRequest.KeyMapEntry */ @@ -271,7 +271,7 @@ UPB_INLINE upb_Array* _grpc_lookup_v1_RouteLookupResponse_targets_mutable_upb_ar UPB_INLINE void grpc_lookup_v1_RouteLookupResponse_set_header_data(grpc_lookup_v1_RouteLookupResponse *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 8), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* grpc_lookup_v1_RouteLookupResponse_mutable_targets(grpc_lookup_v1_RouteLookupResponse* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(8, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c index 08a38c9f53..098eefb87c 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupRequest_msg_init = { &grpc_lookup_v1_RouteLookupRequest_submsgs[0], &grpc_lookup_v1_RouteLookupRequest__fields[0], UPB_SIZE(32, 56), 4, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -48,6 +51,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init = NULL, &grpc_lookup_v1_RouteLookupRequest_KeyMapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupRequest.KeyMapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -65,6 +71,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupResponse_msg_init = { NULL, &grpc_lookup_v1_RouteLookupResponse__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupResponse", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h index 70d96fa930..41e7aa69f3 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb.h @@ -129,7 +129,7 @@ UPB_INLINE bool grpc_lookup_v1_NameMatcher_required_match(const grpc_lookup_v1_N UPB_INLINE void grpc_lookup_v1_NameMatcher_set_key(grpc_lookup_v1_NameMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* grpc_lookup_v1_NameMatcher_mutable_names(grpc_lookup_v1_NameMatcher* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(8, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -161,7 +161,7 @@ UPB_INLINE bool grpc_lookup_v1_NameMatcher_add_names(grpc_lookup_v1_NameMatcher* } UPB_INLINE void grpc_lookup_v1_NameMatcher_set_required_match(grpc_lookup_v1_NameMatcher *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 8), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.GrpcKeyBuilder */ @@ -372,7 +372,7 @@ UPB_INLINE struct grpc_lookup_v1_NameMatcher* grpc_lookup_v1_GrpcKeyBuilder_add_ } UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_set_extra_keys(grpc_lookup_v1_GrpcKeyBuilder *msg, grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 32), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* grpc_lookup_v1_GrpcKeyBuilder_mutable_extra_keys(grpc_lookup_v1_GrpcKeyBuilder* msg, upb_Arena* arena) { struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys* sub = (struct grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys*)grpc_lookup_v1_GrpcKeyBuilder_extra_keys(msg); @@ -471,11 +471,11 @@ UPB_INLINE upb_StringView grpc_lookup_v1_GrpcKeyBuilder_Name_method(const grpc_l UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_Name_set_service(grpc_lookup_v1_GrpcKeyBuilder_Name *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_Name_set_method(grpc_lookup_v1_GrpcKeyBuilder_Name *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.GrpcKeyBuilder.ExtraKeys */ @@ -553,15 +553,15 @@ UPB_INLINE upb_StringView grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_method(const g UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_set_host(grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_set_service(grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys_set_method(grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(24, 40), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.GrpcKeyBuilder.ConstantKeysEntry */ @@ -1213,11 +1213,11 @@ UPB_INLINE struct grpc_lookup_v1_GrpcKeyBuilder* grpc_lookup_v1_RouteLookupConfi } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_lookup_service(grpc_lookup_v1_RouteLookupConfig *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(36, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_lookup_service_timeout(grpc_lookup_v1_RouteLookupConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 48), 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_lookup_service_timeout(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_lookup_service_timeout(msg); @@ -1229,7 +1229,7 @@ UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mut } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_max_age(grpc_lookup_v1_RouteLookupConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 56), 65, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_max_age(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_max_age(msg); @@ -1241,7 +1241,7 @@ UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mut } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_stale_age(grpc_lookup_v1_RouteLookupConfig *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 64), 66, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mutable_stale_age(grpc_lookup_v1_RouteLookupConfig* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)grpc_lookup_v1_RouteLookupConfig_stale_age(msg); @@ -1253,7 +1253,7 @@ UPB_INLINE struct google_protobuf_Duration* grpc_lookup_v1_RouteLookupConfig_mut } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_cache_size_bytes(grpc_lookup_v1_RouteLookupConfig *msg, int64_t value) { const upb_MiniTableField field = {7, UPB_SIZE(48, 72), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* grpc_lookup_v1_RouteLookupConfig_mutable_valid_targets(grpc_lookup_v1_RouteLookupConfig* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(32, 80), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1285,7 +1285,7 @@ UPB_INLINE bool grpc_lookup_v1_RouteLookupConfig_add_valid_targets(grpc_lookup_v } UPB_INLINE void grpc_lookup_v1_RouteLookupConfig_set_default_target(grpc_lookup_v1_RouteLookupConfig *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(56, 88), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* grpc.lookup.v1.RouteLookupClusterSpecifier */ @@ -1343,7 +1343,7 @@ UPB_INLINE bool grpc_lookup_v1_RouteLookupClusterSpecifier_has_route_lookup_conf UPB_INLINE void grpc_lookup_v1_RouteLookupClusterSpecifier_set_route_lookup_config(grpc_lookup_v1_RouteLookupClusterSpecifier *msg, grpc_lookup_v1_RouteLookupConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupClusterSpecifier_mutable_route_lookup_config(grpc_lookup_v1_RouteLookupClusterSpecifier* msg, upb_Arena* arena) { struct grpc_lookup_v1_RouteLookupConfig* sub = (struct grpc_lookup_v1_RouteLookupConfig*)grpc_lookup_v1_RouteLookupClusterSpecifier_route_lookup_config(msg); diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c index 04accdff52..b9d68def84 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable grpc__lookup__v1__NameMatcher_msg_init = { NULL, &grpc_lookup_v1_NameMatcher__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.NameMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -49,6 +52,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init = { &grpc_lookup_v1_GrpcKeyBuilder_submsgs[0], &grpc_lookup_v1_GrpcKeyBuilder__fields[0], UPB_SIZE(32, 48), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.GrpcKeyBuilder", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -66,6 +72,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init = { NULL, &grpc_lookup_v1_GrpcKeyBuilder_Name__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.GrpcKeyBuilder.Name", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -84,6 +93,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init = { NULL, &grpc_lookup_v1_GrpcKeyBuilder_ExtraKeys__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.GrpcKeyBuilder.ExtraKeys", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -101,6 +113,9 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init NULL, &grpc_lookup_v1_GrpcKeyBuilder_ConstantKeysEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.GrpcKeyBuilder.ConstantKeysEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -127,6 +142,9 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init = { &grpc_lookup_v1_HttpKeyBuilder_submsgs[0], &grpc_lookup_v1_HttpKeyBuilder__fields[0], UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.HttpKeyBuilder", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prs_1bt}, @@ -148,6 +166,9 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init NULL, &grpc_lookup_v1_HttpKeyBuilder_ConstantKeysEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.HttpKeyBuilder.ConstantKeysEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -180,6 +201,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = { &grpc_lookup_v1_RouteLookupConfig_submsgs[0], &grpc_lookup_v1_RouteLookupConfig__fields[0], UPB_SIZE(64, 104), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_max64b}, @@ -212,6 +236,9 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init = { &grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[0], &grpc_lookup_v1_RouteLookupClusterSpecifier__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "grpc.lookup.v1.RouteLookupClusterSpecifier", +#endif }; static const upb_MiniTable *messages_layout[9] = { diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h index fb85a23e21..3af3b765d8 100644 --- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h @@ -83,7 +83,7 @@ UPB_INLINE upb_StringView udpa_annotations_MigrateAnnotation_rename(const udpa_a UPB_INLINE void udpa_annotations_MigrateAnnotation_set_rename(udpa_annotations_MigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* udpa.annotations.FieldMigrateAnnotation */ @@ -149,11 +149,11 @@ UPB_INLINE upb_StringView udpa_annotations_FieldMigrateAnnotation_oneof_promotio UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_rename(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void udpa_annotations_FieldMigrateAnnotation_set_oneof_promotion(udpa_annotations_FieldMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* udpa.annotations.FileMigrateAnnotation */ @@ -207,7 +207,7 @@ UPB_INLINE upb_StringView udpa_annotations_FileMigrateAnnotation_move_to_package UPB_INLINE void udpa_annotations_FileMigrateAnnotation_set_move_to_package(udpa_annotations_FileMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool udpa_annotations_has_message_migrate(const struct google_protobuf_MessageOptions* msg) { @@ -231,9 +231,18 @@ UPB_INLINE void udpa_annotations_set_message_migrate(struct google_protobuf_Mess UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_message_migrate(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_message_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_message_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool udpa_annotations_has_field_migrate(const struct google_protobuf_FieldOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_field_migrate_ext); } @@ -255,9 +264,18 @@ UPB_INLINE void udpa_annotations_set_field_migrate(struct google_protobuf_FieldO UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_FieldMigrateAnnotation* udpa_annotations_mutable_field_migrate(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_FieldMigrateAnnotation* sub = (struct udpa_annotations_FieldMigrateAnnotation*)udpa_annotations_field_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_FieldMigrateAnnotation*)_upb_Message_New(&udpa__annotations__FieldMigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_field_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool udpa_annotations_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_enum_migrate_ext); } @@ -279,9 +297,18 @@ UPB_INLINE void udpa_annotations_set_enum_migrate(struct google_protobuf_EnumOpt UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_enum_migrate(struct google_protobuf_EnumOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_enum_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_enum_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool udpa_annotations_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_enum_value_migrate_ext); } @@ -303,9 +330,18 @@ UPB_INLINE void udpa_annotations_set_enum_value_migrate(struct google_protobuf_E UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_MigrateAnnotation* udpa_annotations_mutable_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_MigrateAnnotation* sub = (struct udpa_annotations_MigrateAnnotation*)udpa_annotations_enum_value_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_MigrateAnnotation*)_upb_Message_New(&udpa__annotations__MigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_enum_value_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool udpa_annotations_has_file_migrate(const struct google_protobuf_FileOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &udpa_annotations_file_migrate_ext); } @@ -327,9 +363,18 @@ UPB_INLINE void udpa_annotations_set_file_migrate(struct google_protobuf_FileOpt UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_FileMigrateAnnotation* udpa_annotations_mutable_file_migrate(struct google_protobuf_FileOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_FileMigrateAnnotation* sub = (struct udpa_annotations_FileMigrateAnnotation*)udpa_annotations_file_migrate(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_FileMigrateAnnotation*)_upb_Message_New(&udpa__annotations__FileMigrateAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_file_migrate(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c index 6858d72249..3b63134fa1 100644 --- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable udpa__annotations__MigrateAnnotation_msg_init = { NULL, &udpa_annotations_MigrateAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.MigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -36,6 +39,9 @@ const upb_MiniTable udpa__annotations__FieldMigrateAnnotation_msg_init = { NULL, &udpa_annotations_FieldMigrateAnnotation__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.FieldMigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -52,6 +58,9 @@ const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init = { NULL, &udpa_annotations_FileMigrateAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.FileMigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb.h b/src/core/ext/upb-gen/udpa/annotations/security.upb.h index 3d23f5944f..3b00d090b7 100644 --- a/src/core/ext/upb-gen/udpa/annotations/security.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/security.upb.h @@ -90,11 +90,11 @@ UPB_INLINE bool udpa_annotations_FieldSecurityAnnotation_configure_for_untrusted UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void udpa_annotations_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(udpa_annotations_FieldSecurityAnnotation *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool udpa_annotations_has_security(const struct google_protobuf_FieldOptions* msg) { @@ -118,9 +118,18 @@ UPB_INLINE void udpa_annotations_set_security(struct google_protobuf_FieldOption UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_FieldSecurityAnnotation* udpa_annotations_mutable_security(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_FieldSecurityAnnotation* sub = (struct udpa_annotations_FieldSecurityAnnotation*)udpa_annotations_security(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_FieldSecurityAnnotation*)_upb_Message_New(&udpa__annotations__FieldSecurityAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_security(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c index ba9ef77a4a..af73bd4cac 100644 --- a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init = { NULL, &udpa_annotations_FieldSecurityAnnotation__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.FieldSecurityAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h index f98ed2a6e8..3196d9cff3 100644 --- a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h @@ -45,7 +45,7 @@ UPB_INLINE void udpa_annotations_set_sensitive(struct google_protobuf_FieldOptio UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb.h b/src/core/ext/upb-gen/udpa/annotations/status.upb.h index bb31624415..95f710a5a3 100644 --- a/src/core/ext/upb-gen/udpa/annotations/status.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/status.upb.h @@ -96,11 +96,11 @@ UPB_INLINE int32_t udpa_annotations_StatusAnnotation_package_version_status(cons UPB_INLINE void udpa_annotations_StatusAnnotation_set_work_in_progress(udpa_annotations_StatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void udpa_annotations_StatusAnnotation_set_package_version_status(udpa_annotations_StatusAnnotation *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool udpa_annotations_has_file_status(const struct google_protobuf_FileOptions* msg) { @@ -124,9 +124,18 @@ UPB_INLINE void udpa_annotations_set_file_status(struct google_protobuf_FileOpti UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_StatusAnnotation* udpa_annotations_mutable_file_status(struct google_protobuf_FileOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_StatusAnnotation* sub = (struct udpa_annotations_StatusAnnotation*)udpa_annotations_file_status(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_StatusAnnotation*)_upb_Message_New(&udpa__annotations__StatusAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_file_status(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c index a408659622..2eb07ceec1 100644 --- a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.c @@ -22,6 +22,9 @@ const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init = { NULL, &udpa_annotations_StatusAnnotation__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.StatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h index f16de22335..a9bfb48a4f 100644 --- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h @@ -77,7 +77,7 @@ UPB_INLINE upb_StringView udpa_annotations_VersioningAnnotation_previous_message UPB_INLINE void udpa_annotations_VersioningAnnotation_set_previous_message_type(udpa_annotations_VersioningAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool udpa_annotations_has_versioning(const struct google_protobuf_MessageOptions* msg) { @@ -101,9 +101,18 @@ UPB_INLINE void udpa_annotations_set_versioning(struct google_protobuf_MessageOp UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct udpa_annotations_VersioningAnnotation* udpa_annotations_mutable_versioning(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct udpa_annotations_VersioningAnnotation* sub = (struct udpa_annotations_VersioningAnnotation*)udpa_annotations_versioning(msg); + if (sub == NULL) { + sub = (struct udpa_annotations_VersioningAnnotation*)_upb_Message_New(&udpa__annotations__VersioningAnnotation_msg_init, arena); + if (sub) udpa_annotations_set_versioning(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c index e14a4e0573..fcb4fdea2a 100644 --- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c +++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init = { NULL, &udpa_annotations_VersioningAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "udpa.annotations.VersioningAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/validate/validate.upb.h b/src/core/ext/upb-gen/validate/validate.upb.h index 79ff48f5bc..ae9329d7ea 100644 --- a/src/core/ext/upb-gen/validate/validate.upb.h +++ b/src/core/ext/upb-gen/validate/validate.upb.h @@ -480,7 +480,7 @@ UPB_INLINE bool validate_FieldRules_has_timestamp(const validate_FieldRules* msg UPB_INLINE void validate_FieldRules_set_float(validate_FieldRules *msg, validate_FloatRules* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FloatRules* validate_FieldRules_mutable_float(validate_FieldRules* msg, upb_Arena* arena) { struct validate_FloatRules* sub = (struct validate_FloatRules*)validate_FieldRules_float(msg); @@ -492,7 +492,7 @@ UPB_INLINE struct validate_FloatRules* validate_FieldRules_mutable_float(validat } UPB_INLINE void validate_FieldRules_set_double(validate_FieldRules *msg, validate_DoubleRules* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_DoubleRules* validate_FieldRules_mutable_double(validate_FieldRules* msg, upb_Arena* arena) { struct validate_DoubleRules* sub = (struct validate_DoubleRules*)validate_FieldRules_double(msg); @@ -504,7 +504,7 @@ UPB_INLINE struct validate_DoubleRules* validate_FieldRules_mutable_double(valid } UPB_INLINE void validate_FieldRules_set_int32(validate_FieldRules *msg, validate_Int32Rules* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Int32Rules* validate_FieldRules_mutable_int32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_Int32Rules* sub = (struct validate_Int32Rules*)validate_FieldRules_int32(msg); @@ -516,7 +516,7 @@ UPB_INLINE struct validate_Int32Rules* validate_FieldRules_mutable_int32(validat } UPB_INLINE void validate_FieldRules_set_int64(validate_FieldRules *msg, validate_Int64Rules* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Int64Rules* validate_FieldRules_mutable_int64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_Int64Rules* sub = (struct validate_Int64Rules*)validate_FieldRules_int64(msg); @@ -528,7 +528,7 @@ UPB_INLINE struct validate_Int64Rules* validate_FieldRules_mutable_int64(validat } UPB_INLINE void validate_FieldRules_set_uint32(validate_FieldRules *msg, validate_UInt32Rules* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_UInt32Rules* validate_FieldRules_mutable_uint32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_UInt32Rules* sub = (struct validate_UInt32Rules*)validate_FieldRules_uint32(msg); @@ -540,7 +540,7 @@ UPB_INLINE struct validate_UInt32Rules* validate_FieldRules_mutable_uint32(valid } UPB_INLINE void validate_FieldRules_set_uint64(validate_FieldRules *msg, validate_UInt64Rules* value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_UInt64Rules* validate_FieldRules_mutable_uint64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_UInt64Rules* sub = (struct validate_UInt64Rules*)validate_FieldRules_uint64(msg); @@ -552,7 +552,7 @@ UPB_INLINE struct validate_UInt64Rules* validate_FieldRules_mutable_uint64(valid } UPB_INLINE void validate_FieldRules_set_sint32(validate_FieldRules *msg, validate_SInt32Rules* value) { const upb_MiniTableField field = {7, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 6, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SInt32Rules* validate_FieldRules_mutable_sint32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_SInt32Rules* sub = (struct validate_SInt32Rules*)validate_FieldRules_sint32(msg); @@ -564,7 +564,7 @@ UPB_INLINE struct validate_SInt32Rules* validate_FieldRules_mutable_sint32(valid } UPB_INLINE void validate_FieldRules_set_sint64(validate_FieldRules *msg, validate_SInt64Rules* value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 7, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SInt64Rules* validate_FieldRules_mutable_sint64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_SInt64Rules* sub = (struct validate_SInt64Rules*)validate_FieldRules_sint64(msg); @@ -576,7 +576,7 @@ UPB_INLINE struct validate_SInt64Rules* validate_FieldRules_mutable_sint64(valid } UPB_INLINE void validate_FieldRules_set_fixed32(validate_FieldRules *msg, validate_Fixed32Rules* value) { const upb_MiniTableField field = {9, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 8, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Fixed32Rules* validate_FieldRules_mutable_fixed32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_Fixed32Rules* sub = (struct validate_Fixed32Rules*)validate_FieldRules_fixed32(msg); @@ -588,7 +588,7 @@ UPB_INLINE struct validate_Fixed32Rules* validate_FieldRules_mutable_fixed32(val } UPB_INLINE void validate_FieldRules_set_fixed64(validate_FieldRules *msg, validate_Fixed64Rules* value) { const upb_MiniTableField field = {10, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 9, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_Fixed64Rules* validate_FieldRules_mutable_fixed64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_Fixed64Rules* sub = (struct validate_Fixed64Rules*)validate_FieldRules_fixed64(msg); @@ -600,7 +600,7 @@ UPB_INLINE struct validate_Fixed64Rules* validate_FieldRules_mutable_fixed64(val } UPB_INLINE void validate_FieldRules_set_sfixed32(validate_FieldRules *msg, validate_SFixed32Rules* value) { const upb_MiniTableField field = {11, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 10, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SFixed32Rules* validate_FieldRules_mutable_sfixed32(validate_FieldRules* msg, upb_Arena* arena) { struct validate_SFixed32Rules* sub = (struct validate_SFixed32Rules*)validate_FieldRules_sfixed32(msg); @@ -612,7 +612,7 @@ UPB_INLINE struct validate_SFixed32Rules* validate_FieldRules_mutable_sfixed32(v } UPB_INLINE void validate_FieldRules_set_sfixed64(validate_FieldRules *msg, validate_SFixed64Rules* value) { const upb_MiniTableField field = {12, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 11, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_SFixed64Rules* validate_FieldRules_mutable_sfixed64(validate_FieldRules* msg, upb_Arena* arena) { struct validate_SFixed64Rules* sub = (struct validate_SFixed64Rules*)validate_FieldRules_sfixed64(msg); @@ -624,7 +624,7 @@ UPB_INLINE struct validate_SFixed64Rules* validate_FieldRules_mutable_sfixed64(v } UPB_INLINE void validate_FieldRules_set_bool(validate_FieldRules *msg, validate_BoolRules* value) { const upb_MiniTableField field = {13, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 12, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_BoolRules* validate_FieldRules_mutable_bool(validate_FieldRules* msg, upb_Arena* arena) { struct validate_BoolRules* sub = (struct validate_BoolRules*)validate_FieldRules_bool(msg); @@ -636,7 +636,7 @@ UPB_INLINE struct validate_BoolRules* validate_FieldRules_mutable_bool(validate_ } UPB_INLINE void validate_FieldRules_set_string(validate_FieldRules *msg, validate_StringRules* value) { const upb_MiniTableField field = {14, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 13, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_StringRules* validate_FieldRules_mutable_string(validate_FieldRules* msg, upb_Arena* arena) { struct validate_StringRules* sub = (struct validate_StringRules*)validate_FieldRules_string(msg); @@ -648,7 +648,7 @@ UPB_INLINE struct validate_StringRules* validate_FieldRules_mutable_string(valid } UPB_INLINE void validate_FieldRules_set_bytes(validate_FieldRules *msg, validate_BytesRules* value) { const upb_MiniTableField field = {15, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 14, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_BytesRules* validate_FieldRules_mutable_bytes(validate_FieldRules* msg, upb_Arena* arena) { struct validate_BytesRules* sub = (struct validate_BytesRules*)validate_FieldRules_bytes(msg); @@ -660,7 +660,7 @@ UPB_INLINE struct validate_BytesRules* validate_FieldRules_mutable_bytes(validat } UPB_INLINE void validate_FieldRules_set_enum(validate_FieldRules *msg, validate_EnumRules* value) { const upb_MiniTableField field = {16, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 15, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_EnumRules* validate_FieldRules_mutable_enum(validate_FieldRules* msg, upb_Arena* arena) { struct validate_EnumRules* sub = (struct validate_EnumRules*)validate_FieldRules_enum(msg); @@ -672,7 +672,7 @@ UPB_INLINE struct validate_EnumRules* validate_FieldRules_mutable_enum(validate_ } UPB_INLINE void validate_FieldRules_set_message(validate_FieldRules *msg, validate_MessageRules* value) { const upb_MiniTableField field = {17, UPB_SIZE(12, 16), 64, 16, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_MessageRules* validate_FieldRules_mutable_message(validate_FieldRules* msg, upb_Arena* arena) { struct validate_MessageRules* sub = (struct validate_MessageRules*)validate_FieldRules_message(msg); @@ -684,7 +684,7 @@ UPB_INLINE struct validate_MessageRules* validate_FieldRules_mutable_message(val } UPB_INLINE void validate_FieldRules_set_repeated(validate_FieldRules *msg, validate_RepeatedRules* value) { const upb_MiniTableField field = {18, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 17, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_RepeatedRules* validate_FieldRules_mutable_repeated(validate_FieldRules* msg, upb_Arena* arena) { struct validate_RepeatedRules* sub = (struct validate_RepeatedRules*)validate_FieldRules_repeated(msg); @@ -696,7 +696,7 @@ UPB_INLINE struct validate_RepeatedRules* validate_FieldRules_mutable_repeated(v } UPB_INLINE void validate_FieldRules_set_map(validate_FieldRules *msg, validate_MapRules* value) { const upb_MiniTableField field = {19, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 18, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_MapRules* validate_FieldRules_mutable_map(validate_FieldRules* msg, upb_Arena* arena) { struct validate_MapRules* sub = (struct validate_MapRules*)validate_FieldRules_map(msg); @@ -708,7 +708,7 @@ UPB_INLINE struct validate_MapRules* validate_FieldRules_mutable_map(validate_Fi } UPB_INLINE void validate_FieldRules_set_any(validate_FieldRules *msg, validate_AnyRules* value) { const upb_MiniTableField field = {20, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 19, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_AnyRules* validate_FieldRules_mutable_any(validate_FieldRules* msg, upb_Arena* arena) { struct validate_AnyRules* sub = (struct validate_AnyRules*)validate_FieldRules_any(msg); @@ -720,7 +720,7 @@ UPB_INLINE struct validate_AnyRules* validate_FieldRules_mutable_any(validate_Fi } UPB_INLINE void validate_FieldRules_set_duration(validate_FieldRules *msg, validate_DurationRules* value) { const upb_MiniTableField field = {21, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 20, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_DurationRules* validate_FieldRules_mutable_duration(validate_FieldRules* msg, upb_Arena* arena) { struct validate_DurationRules* sub = (struct validate_DurationRules*)validate_FieldRules_duration(msg); @@ -732,7 +732,7 @@ UPB_INLINE struct validate_DurationRules* validate_FieldRules_mutable_duration(v } UPB_INLINE void validate_FieldRules_set_timestamp(validate_FieldRules *msg, validate_TimestampRules* value) { const upb_MiniTableField field = {22, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 21, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_TimestampRules* validate_FieldRules_mutable_timestamp(validate_FieldRules* msg, upb_Arena* arena) { struct validate_TimestampRules* sub = (struct validate_TimestampRules*)validate_FieldRules_timestamp(msg); @@ -942,23 +942,23 @@ UPB_INLINE bool validate_FloatRules_has_ignore_empty(const validate_FloatRules* UPB_INLINE void validate_FloatRules_set_const(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_FloatRules_set_lt(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_FloatRules_set_lte(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_FloatRules_set_gt(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_FloatRules_set_gte(validate_FloatRules *msg, float value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 2, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE float* validate_FloatRules_mutable_in(validate_FloatRules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 2, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1018,7 +1018,7 @@ UPB_INLINE bool validate_FloatRules_add_not_in(validate_FloatRules* msg, float v } UPB_INLINE void validate_FloatRules_set_ignore_empty(validate_FloatRules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.DoubleRules */ @@ -1220,23 +1220,23 @@ UPB_INLINE bool validate_DoubleRules_has_ignore_empty(const validate_DoubleRules UPB_INLINE void validate_DoubleRules_set_const(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DoubleRules_set_lt(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DoubleRules_set_lte(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DoubleRules_set_gt(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DoubleRules_set_gte(validate_DoubleRules *msg, double value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE double* validate_DoubleRules_mutable_in(validate_DoubleRules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1296,7 +1296,7 @@ UPB_INLINE bool validate_DoubleRules_add_not_in(validate_DoubleRules* msg, doubl } UPB_INLINE void validate_DoubleRules_set_ignore_empty(validate_DoubleRules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.Int32Rules */ @@ -1498,23 +1498,23 @@ UPB_INLINE bool validate_Int32Rules_has_ignore_empty(const validate_Int32Rules* UPB_INLINE void validate_Int32Rules_set_const(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int32Rules_set_lt(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int32Rules_set_lte(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int32Rules_set_gt(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int32Rules_set_gte(validate_Int32Rules *msg, int32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* validate_Int32Rules_mutable_in(validate_Int32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1574,7 +1574,7 @@ UPB_INLINE bool validate_Int32Rules_add_not_in(validate_Int32Rules* msg, int32_t } UPB_INLINE void validate_Int32Rules_set_ignore_empty(validate_Int32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.Int64Rules */ @@ -1776,23 +1776,23 @@ UPB_INLINE bool validate_Int64Rules_has_ignore_empty(const validate_Int64Rules* UPB_INLINE void validate_Int64Rules_set_const(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int64Rules_set_lt(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int64Rules_set_lte(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int64Rules_set_gt(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Int64Rules_set_gte(validate_Int64Rules *msg, int64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int64_t* validate_Int64Rules_mutable_in(validate_Int64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -1852,7 +1852,7 @@ UPB_INLINE bool validate_Int64Rules_add_not_in(validate_Int64Rules* msg, int64_t } UPB_INLINE void validate_Int64Rules_set_ignore_empty(validate_Int64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.UInt32Rules */ @@ -2054,23 +2054,23 @@ UPB_INLINE bool validate_UInt32Rules_has_ignore_empty(const validate_UInt32Rules UPB_INLINE void validate_UInt32Rules_set_const(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt32Rules_set_lt(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt32Rules_set_lte(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt32Rules_set_gt(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt32Rules_set_gte(validate_UInt32Rules *msg, uint32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 13, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint32_t* validate_UInt32Rules_mutable_in(validate_UInt32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 13, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2130,7 +2130,7 @@ UPB_INLINE bool validate_UInt32Rules_add_not_in(validate_UInt32Rules* msg, uint3 } UPB_INLINE void validate_UInt32Rules_set_ignore_empty(validate_UInt32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.UInt64Rules */ @@ -2332,23 +2332,23 @@ UPB_INLINE bool validate_UInt64Rules_has_ignore_empty(const validate_UInt64Rules UPB_INLINE void validate_UInt64Rules_set_const(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt64Rules_set_lt(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt64Rules_set_lte(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt64Rules_set_gt(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_UInt64Rules_set_gte(validate_UInt64Rules *msg, uint64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint64_t* validate_UInt64Rules_mutable_in(validate_UInt64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2408,7 +2408,7 @@ UPB_INLINE bool validate_UInt64Rules_add_not_in(validate_UInt64Rules* msg, uint6 } UPB_INLINE void validate_UInt64Rules_set_ignore_empty(validate_UInt64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.SInt32Rules */ @@ -2610,23 +2610,23 @@ UPB_INLINE bool validate_SInt32Rules_has_ignore_empty(const validate_SInt32Rules UPB_INLINE void validate_SInt32Rules_set_const(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt32Rules_set_lt(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt32Rules_set_lte(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt32Rules_set_gt(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt32Rules_set_gte(validate_SInt32Rules *msg, int32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 17, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* validate_SInt32Rules_mutable_in(validate_SInt32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 17, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2686,7 +2686,7 @@ UPB_INLINE bool validate_SInt32Rules_add_not_in(validate_SInt32Rules* msg, int32 } UPB_INLINE void validate_SInt32Rules_set_ignore_empty(validate_SInt32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.SInt64Rules */ @@ -2888,23 +2888,23 @@ UPB_INLINE bool validate_SInt64Rules_has_ignore_empty(const validate_SInt64Rules UPB_INLINE void validate_SInt64Rules_set_const(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt64Rules_set_lt(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt64Rules_set_lte(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt64Rules_set_gt(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SInt64Rules_set_gte(validate_SInt64Rules *msg, int64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 18, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int64_t* validate_SInt64Rules_mutable_in(validate_SInt64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 18, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -2964,7 +2964,7 @@ UPB_INLINE bool validate_SInt64Rules_add_not_in(validate_SInt64Rules* msg, int64 } UPB_INLINE void validate_SInt64Rules_set_ignore_empty(validate_SInt64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.Fixed32Rules */ @@ -3166,23 +3166,23 @@ UPB_INLINE bool validate_Fixed32Rules_has_ignore_empty(const validate_Fixed32Rul UPB_INLINE void validate_Fixed32Rules_set_const(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed32Rules_set_lt(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed32Rules_set_lte(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed32Rules_set_gt(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed32Rules_set_gte(validate_Fixed32Rules *msg, uint32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 7, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint32_t* validate_Fixed32Rules_mutable_in(validate_Fixed32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 7, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -3242,7 +3242,7 @@ UPB_INLINE bool validate_Fixed32Rules_add_not_in(validate_Fixed32Rules* msg, uin } UPB_INLINE void validate_Fixed32Rules_set_ignore_empty(validate_Fixed32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.Fixed64Rules */ @@ -3444,23 +3444,23 @@ UPB_INLINE bool validate_Fixed64Rules_has_ignore_empty(const validate_Fixed64Rul UPB_INLINE void validate_Fixed64Rules_set_const(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed64Rules_set_lt(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed64Rules_set_lte(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed64Rules_set_gt(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_Fixed64Rules_set_gte(validate_Fixed64Rules *msg, uint64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 6, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE uint64_t* validate_Fixed64Rules_mutable_in(validate_Fixed64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 6, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -3520,7 +3520,7 @@ UPB_INLINE bool validate_Fixed64Rules_add_not_in(validate_Fixed64Rules* msg, uin } UPB_INLINE void validate_Fixed64Rules_set_ignore_empty(validate_Fixed64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.SFixed32Rules */ @@ -3722,23 +3722,23 @@ UPB_INLINE bool validate_SFixed32Rules_has_ignore_empty(const validate_SFixed32R UPB_INLINE void validate_SFixed32Rules_set_const(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed32Rules_set_lt(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed32Rules_set_lte(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {3, 20, 66, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed32Rules_set_gt(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {4, 24, 67, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed32Rules_set_gte(validate_SFixed32Rules *msg, int32_t value) { const upb_MiniTableField field = {5, 28, 68, kUpb_NoSub, 15, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* validate_SFixed32Rules_mutable_in(validate_SFixed32Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(32, 40), 0, kUpb_NoSub, 15, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -3798,7 +3798,7 @@ UPB_INLINE bool validate_SFixed32Rules_add_not_in(validate_SFixed32Rules* msg, i } UPB_INLINE void validate_SFixed32Rules_set_ignore_empty(validate_SFixed32Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(40, 32), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.SFixed64Rules */ @@ -4000,23 +4000,23 @@ UPB_INLINE bool validate_SFixed64Rules_has_ignore_empty(const validate_SFixed64R UPB_INLINE void validate_SFixed64Rules_set_const(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed64Rules_set_lt(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed64Rules_set_lte(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 32), 66, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed64Rules_set_gt(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {4, UPB_SIZE(48, 40), 67, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_SFixed64Rules_set_gte(validate_SFixed64Rules *msg, int64_t value) { const upb_MiniTableField field = {5, UPB_SIZE(56, 48), 68, kUpb_NoSub, 16, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int64_t* validate_SFixed64Rules_mutable_in(validate_SFixed64Rules* msg, size_t* size) { upb_MiniTableField field = {6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 16, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -4076,7 +4076,7 @@ UPB_INLINE bool validate_SFixed64Rules_add_not_in(validate_SFixed64Rules* msg, i } UPB_INLINE void validate_SFixed64Rules_set_ignore_empty(validate_SFixed64Rules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(20, 9), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.BoolRules */ @@ -4134,7 +4134,7 @@ UPB_INLINE bool validate_BoolRules_has_const(const validate_BoolRules* msg) { UPB_INLINE void validate_BoolRules_set_const(validate_BoolRules *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.StringRules */ @@ -4642,39 +4642,39 @@ UPB_INLINE bool validate_StringRules_has_ignore_empty(const validate_StringRules UPB_INLINE void validate_StringRules_set_const(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(32, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_min_len(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {2, 40, 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_max_len(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {3, 48, 66, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_min_bytes(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {4, 56, 67, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_max_bytes(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {5, 64, 68, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_pattern(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {6, 72, 69, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_prefix(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(80, 88), 70, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_suffix(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {8, UPB_SIZE(88, 104), 71, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_contains(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {9, UPB_SIZE(96, 120), 72, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* validate_StringRules_mutable_in(validate_StringRules* msg, size_t* size) { upb_MiniTableField field = {10, UPB_SIZE(12, 136), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -4734,63 +4734,63 @@ UPB_INLINE bool validate_StringRules_add_not_in(validate_StringRules* msg, upb_S } UPB_INLINE void validate_StringRules_set_email(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {12, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_hostname(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {13, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_ip(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_ipv4(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {15, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_ipv6(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {16, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_uri(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {17, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_uri_ref(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {18, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_len(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {19, UPB_SIZE(104, 152), 73, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_len_bytes(validate_StringRules *msg, uint64_t value) { const upb_MiniTableField field = {20, UPB_SIZE(112, 160), 74, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_address(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {21, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_uuid(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {22, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_not_contains(validate_StringRules *msg, upb_StringView value) { const upb_MiniTableField field = {23, UPB_SIZE(120, 168), 75, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_well_known_regex(validate_StringRules *msg, int32_t value) { const upb_MiniTableField field = {24, UPB_SIZE(28, 20), UPB_SIZE(-21, -13), 0, 14, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_strict(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {25, UPB_SIZE(24, 16), 76, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_StringRules_set_ignore_empty(validate_StringRules *msg, bool value) { const upb_MiniTableField field = {26, UPB_SIZE(25, 17), 77, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.BytesRules */ @@ -5099,31 +5099,31 @@ UPB_INLINE bool validate_BytesRules_has_ignore_empty(const validate_BytesRules* UPB_INLINE void validate_BytesRules_set_const(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {1, UPB_SIZE(28, 24), 64, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_min_len(validate_BytesRules *msg, uint64_t value) { const upb_MiniTableField field = {2, 40, 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_max_len(validate_BytesRules *msg, uint64_t value) { const upb_MiniTableField field = {3, 48, 66, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_pattern(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {4, 56, 67, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_prefix(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {5, UPB_SIZE(64, 72), 68, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_suffix(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {6, UPB_SIZE(72, 88), 69, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_contains(validate_BytesRules *msg, upb_StringView value) { const upb_MiniTableField field = {7, UPB_SIZE(80, 104), 70, kUpb_NoSub, 12, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* validate_BytesRules_mutable_in(validate_BytesRules* msg, size_t* size) { upb_MiniTableField field = {8, UPB_SIZE(12, 120), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -5183,23 +5183,23 @@ UPB_INLINE bool validate_BytesRules_add_not_in(validate_BytesRules* msg, upb_Str } UPB_INLINE void validate_BytesRules_set_ip(validate_BytesRules *msg, bool value) { const upb_MiniTableField field = {10, 10, UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_ipv4(validate_BytesRules *msg, bool value) { const upb_MiniTableField field = {11, 10, UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_ipv6(validate_BytesRules *msg, bool value) { const upb_MiniTableField field = {12, 10, UPB_SIZE(-21, -13), kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_len(validate_BytesRules *msg, uint64_t value) { const upb_MiniTableField field = {13, UPB_SIZE(88, 136), 71, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_BytesRules_set_ignore_empty(validate_BytesRules *msg, bool value) { const upb_MiniTableField field = {14, UPB_SIZE(24, 16), 72, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.EnumRules */ @@ -5337,11 +5337,11 @@ UPB_INLINE upb_Array* _validate_EnumRules_not_in_mutable_upb_array(validate_Enum UPB_INLINE void validate_EnumRules_set_const(validate_EnumRules *msg, int32_t value) { const upb_MiniTableField field = {1, 12, 64, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_EnumRules_set_defined_only(validate_EnumRules *msg, bool value) { const upb_MiniTableField field = {2, 16, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE int32_t* validate_EnumRules_mutable_in(validate_EnumRules* msg, size_t* size) { upb_MiniTableField field = {3, UPB_SIZE(20, 24), 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Array | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -5471,11 +5471,11 @@ UPB_INLINE bool validate_MessageRules_has_required(const validate_MessageRules* UPB_INLINE void validate_MessageRules_set_skip(validate_MessageRules *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_MessageRules_set_required(validate_MessageRules *msg, bool value) { const upb_MiniTableField field = {2, 10, 65, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.RepeatedRules */ @@ -5597,19 +5597,19 @@ UPB_INLINE bool validate_RepeatedRules_has_ignore_empty(const validate_RepeatedR UPB_INLINE void validate_RepeatedRules_set_min_items(validate_RepeatedRules *msg, uint64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_RepeatedRules_set_max_items(validate_RepeatedRules *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_RepeatedRules_set_unique(validate_RepeatedRules *msg, bool value) { const upb_MiniTableField field = {3, 9, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_RepeatedRules_set_items(validate_RepeatedRules *msg, validate_FieldRules* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 67, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_RepeatedRules_mutable_items(validate_RepeatedRules* msg, upb_Arena* arena) { struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_RepeatedRules_items(msg); @@ -5621,7 +5621,7 @@ UPB_INLINE struct validate_FieldRules* validate_RepeatedRules_mutable_items(vali } UPB_INLINE void validate_RepeatedRules_set_ignore_empty(validate_RepeatedRules *msg, bool value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 10), 68, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.MapRules */ @@ -5759,19 +5759,19 @@ UPB_INLINE bool validate_MapRules_has_ignore_empty(const validate_MapRules* msg) UPB_INLINE void validate_MapRules_set_min_pairs(validate_MapRules *msg, uint64_t value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 16), 64, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_MapRules_set_max_pairs(validate_MapRules *msg, uint64_t value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 24), 65, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_MapRules_set_no_sparse(validate_MapRules *msg, bool value) { const upb_MiniTableField field = {3, 9, 66, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_MapRules_set_keys(validate_MapRules *msg, validate_FieldRules* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 32), 67, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_keys(validate_MapRules* msg, upb_Arena* arena) { struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_MapRules_keys(msg); @@ -5783,7 +5783,7 @@ UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_keys(validate_M } UPB_INLINE void validate_MapRules_set_values(validate_MapRules *msg, validate_FieldRules* value) { const upb_MiniTableField field = {5, UPB_SIZE(16, 40), 68, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_values(validate_MapRules* msg, upb_Arena* arena) { struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_MapRules_values(msg); @@ -5795,7 +5795,7 @@ UPB_INLINE struct validate_FieldRules* validate_MapRules_mutable_values(validate } UPB_INLINE void validate_MapRules_set_ignore_empty(validate_MapRules *msg, bool value) { const upb_MiniTableField field = {6, UPB_SIZE(20, 10), 69, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* validate.AnyRules */ @@ -5917,7 +5917,7 @@ UPB_INLINE upb_Array* _validate_AnyRules_not_in_mutable_upb_array(validate_AnyRu UPB_INLINE void validate_AnyRules_set_required(validate_AnyRules *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE upb_StringView* validate_AnyRules_mutable_in(validate_AnyRules* msg, size_t* size) { upb_MiniTableField field = {2, UPB_SIZE(12, 16), 0, kUpb_NoSub, 12, (int)kUpb_FieldMode_Array | (int)kUpb_LabelFlags_IsAlternate | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -6175,11 +6175,11 @@ UPB_INLINE upb_Array* _validate_DurationRules_not_in_mutable_upb_array(validate_ UPB_INLINE void validate_DurationRules_set_required(validate_DurationRules *msg, bool value) { const upb_MiniTableField field = {1, 9, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_DurationRules_set_const(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_const(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_const(msg); @@ -6191,7 +6191,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_const } UPB_INLINE void validate_DurationRules_set_lt(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lt(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_lt(msg); @@ -6203,7 +6203,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lt(va } UPB_INLINE void validate_DurationRules_set_lte(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 67, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lte(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_lte(msg); @@ -6215,7 +6215,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_lte(v } UPB_INLINE void validate_DurationRules_set_gt(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 68, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gt(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_gt(msg); @@ -6227,7 +6227,7 @@ UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gt(va } UPB_INLINE void validate_DurationRules_set_gte(validate_DurationRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 69, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_DurationRules_mutable_gte(validate_DurationRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_DurationRules_gte(msg); @@ -6481,11 +6481,11 @@ UPB_INLINE bool validate_TimestampRules_has_within(const validate_TimestampRules UPB_INLINE void validate_TimestampRules_set_required(validate_TimestampRules *msg, bool value) { const upb_MiniTableField field = {1, 10, 64, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_TimestampRules_set_const(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), 65, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_const(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_const(msg); @@ -6497,7 +6497,7 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_con } UPB_INLINE void validate_TimestampRules_set_lt(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 24), 66, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lt(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_lt(msg); @@ -6509,7 +6509,7 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lt( } UPB_INLINE void validate_TimestampRules_set_lte(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 32), 67, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lte(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_lte(msg); @@ -6521,7 +6521,7 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_lte } UPB_INLINE void validate_TimestampRules_set_gt(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {5, UPB_SIZE(24, 40), 68, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gt(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_gt(msg); @@ -6533,7 +6533,7 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gt( } UPB_INLINE void validate_TimestampRules_set_gte(validate_TimestampRules *msg, struct google_protobuf_Timestamp* value) { const upb_MiniTableField field = {6, UPB_SIZE(28, 48), 69, 4, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gte(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)validate_TimestampRules_gte(msg); @@ -6545,15 +6545,15 @@ UPB_INLINE struct google_protobuf_Timestamp* validate_TimestampRules_mutable_gte } UPB_INLINE void validate_TimestampRules_set_lt_now(validate_TimestampRules *msg, bool value) { const upb_MiniTableField field = {7, UPB_SIZE(32, 11), 70, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_TimestampRules_set_gt_now(validate_TimestampRules *msg, bool value) { const upb_MiniTableField field = {8, UPB_SIZE(33, 12), 71, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void validate_TimestampRules_set_within(validate_TimestampRules *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {9, UPB_SIZE(36, 56), 72, 5, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* validate_TimestampRules_mutable_within(validate_TimestampRules* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)validate_TimestampRules_within(msg); @@ -6585,7 +6585,7 @@ UPB_INLINE void validate_set_disabled(struct google_protobuf_MessageOptions* msg UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool validate_has_ignored(const struct google_protobuf_MessageOptions* msg) { @@ -6609,7 +6609,7 @@ UPB_INLINE void validate_set_ignored(struct google_protobuf_MessageOptions* msg, UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool validate_has_required(const struct google_protobuf_OneofOptions* msg) { @@ -6633,7 +6633,7 @@ UPB_INLINE void validate_set_required(struct google_protobuf_OneofOptions* msg, UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } UPB_INLINE bool validate_has_rules(const struct google_protobuf_FieldOptions* msg) { @@ -6657,9 +6657,18 @@ UPB_INLINE void validate_set_rules(struct google_protobuf_FieldOptions* msg, con UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct validate_FieldRules* validate_mutable_rules(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct validate_FieldRules* sub = (struct validate_FieldRules*)validate_rules(msg); + if (sub == NULL) { + sub = (struct validate_FieldRules*)_upb_Message_New(&validate__FieldRules_msg_init, arena); + if (sub) validate_set_rules(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/validate/validate.upb_minitable.c b/src/core/ext/upb-gen/validate/validate.upb_minitable.c index 5a4d4dcc47..66aa1f4bc8 100644 --- a/src/core/ext/upb-gen/validate/validate.upb_minitable.c +++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.c @@ -69,6 +69,9 @@ const upb_MiniTable validate__FieldRules_msg_init = { &validate_FieldRules_submsgs[0], &validate_FieldRules__fields[0], UPB_SIZE(24, 32), 22, kUpb_ExtMode_NonExtendable, 22, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "validate.FieldRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pom_1bt_max64b}, @@ -120,6 +123,9 @@ const upb_MiniTable validate__FloatRules_msg_init = { NULL, &validate_FloatRules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.FloatRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -147,6 +153,9 @@ const upb_MiniTable validate__DoubleRules_msg_init = { NULL, &validate_DoubleRules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.DoubleRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -174,6 +183,9 @@ const upb_MiniTable validate__Int32Rules_msg_init = { NULL, &validate_Int32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.Int32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -201,6 +213,9 @@ const upb_MiniTable validate__Int64Rules_msg_init = { NULL, &validate_Int64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.Int64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -228,6 +243,9 @@ const upb_MiniTable validate__UInt32Rules_msg_init = { NULL, &validate_UInt32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.UInt32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -255,6 +273,9 @@ const upb_MiniTable validate__UInt64Rules_msg_init = { NULL, &validate_UInt64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.UInt64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -282,6 +303,9 @@ const upb_MiniTable validate__SInt32Rules_msg_init = { NULL, &validate_SInt32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.SInt32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -309,6 +333,9 @@ const upb_MiniTable validate__SInt64Rules_msg_init = { NULL, &validate_SInt64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.SInt64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -336,6 +363,9 @@ const upb_MiniTable validate__Fixed32Rules_msg_init = { NULL, &validate_Fixed32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.Fixed32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -363,6 +393,9 @@ const upb_MiniTable validate__Fixed64Rules_msg_init = { NULL, &validate_Fixed64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.Fixed64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -390,6 +423,9 @@ const upb_MiniTable validate__SFixed32Rules_msg_init = { NULL, &validate_SFixed32Rules__fields[0], UPB_SIZE(48, 56), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.SFixed32Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -417,6 +453,9 @@ const upb_MiniTable validate__SFixed64Rules_msg_init = { NULL, &validate_SFixed64Rules__fields[0], UPB_SIZE(64, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.SFixed64Rules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -437,6 +476,9 @@ const upb_MiniTable validate__BoolRules_msg_init = { NULL, &validate_BoolRules__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.BoolRules", +#endif }; static const upb_MiniTableSub validate_StringRules_submsgs[1] = { @@ -476,6 +518,9 @@ const upb_MiniTable validate__StringRules_msg_init = { &validate_StringRules_submsgs[0], &validate_StringRules__fields[0], UPB_SIZE(128, 184), 26, kUpb_ExtMode_NonExtendable, 26, UPB_FASTTABLE_MASK(248), 0, +#ifdef UPB_TRACING_ENABLED + "validate.StringRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -533,6 +578,9 @@ const upb_MiniTable validate__BytesRules_msg_init = { NULL, &validate_BytesRules__fields[0], UPB_SIZE(96, 144), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "validate.BytesRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -564,6 +612,9 @@ const upb_MiniTable validate__EnumRules_msg_init = { NULL, &validate_EnumRules__fields[0], UPB_SIZE(32, 40), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "validate.EnumRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -585,6 +636,9 @@ const upb_MiniTable validate__MessageRules_msg_init = { NULL, &validate_MessageRules__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.MessageRules", +#endif }; static const upb_MiniTableSub validate_RepeatedRules_submsgs[1] = { @@ -603,6 +657,9 @@ const upb_MiniTable validate__RepeatedRules_msg_init = { &validate_RepeatedRules_submsgs[0], &validate_RepeatedRules__fields[0], 40, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.RepeatedRules", +#endif }; static const upb_MiniTableSub validate_MapRules_submsgs[2] = { @@ -623,6 +680,9 @@ const upb_MiniTable validate__MapRules_msg_init = { &validate_MapRules_submsgs[0], &validate_MapRules__fields[0], UPB_SIZE(40, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.MapRules", +#endif }; static const upb_MiniTableField validate_AnyRules__fields[3] = { @@ -635,6 +695,9 @@ const upb_MiniTable validate__AnyRules_msg_init = { NULL, &validate_AnyRules__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "validate.AnyRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -668,6 +731,9 @@ const upb_MiniTable validate__DurationRules_msg_init = { &validate_DurationRules_submsgs[0], &validate_DurationRules__fields[0], UPB_SIZE(40, 72), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "validate.DurationRules", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -713,6 +779,9 @@ const upb_MiniTable validate__TimestampRules_msg_init = { &validate_TimestampRules_submsgs[0], &validate_TimestampRules__fields[0], UPB_SIZE(40, 64), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "validate.TimestampRules", +#endif }; static const upb_MiniTable *messages_layout[23] = { diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h index 78dee03154..9fc55da1e5 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb.h @@ -83,7 +83,7 @@ UPB_INLINE upb_StringView xds_annotations_v3_MigrateAnnotation_rename(const xds_ UPB_INLINE void xds_annotations_v3_MigrateAnnotation_set_rename(xds_annotations_v3_MigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.FieldMigrateAnnotation */ @@ -149,11 +149,11 @@ UPB_INLINE upb_StringView xds_annotations_v3_FieldMigrateAnnotation_oneof_promot UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_set_rename(xds_annotations_v3_FieldMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_annotations_v3_FieldMigrateAnnotation_set_oneof_promotion(xds_annotations_v3_FieldMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.FileMigrateAnnotation */ @@ -207,7 +207,7 @@ UPB_INLINE upb_StringView xds_annotations_v3_FileMigrateAnnotation_move_to_packa UPB_INLINE void xds_annotations_v3_FileMigrateAnnotation_set_move_to_package(xds_annotations_v3_FileMigrateAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {2, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool xds_annotations_v3_has_message_migrate(const struct google_protobuf_MessageOptions* msg) { @@ -231,9 +231,18 @@ UPB_INLINE void xds_annotations_v3_set_message_migrate(struct google_protobuf_Me UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_mutable_message_migrate(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_MigrateAnnotation* sub = (struct xds_annotations_v3_MigrateAnnotation*)xds_annotations_v3_message_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_MigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__MigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_message_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_field_migrate(const struct google_protobuf_FieldOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_field_migrate_ext); } @@ -255,9 +264,18 @@ UPB_INLINE void xds_annotations_v3_set_field_migrate(struct google_protobuf_Fiel UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_mutable_field_migrate(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FieldMigrateAnnotation* sub = (struct xds_annotations_v3_FieldMigrateAnnotation*)xds_annotations_v3_field_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FieldMigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldMigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_field_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_enum_migrate(const struct google_protobuf_EnumOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_enum_migrate_ext); } @@ -279,9 +297,18 @@ UPB_INLINE void xds_annotations_v3_set_enum_migrate(struct google_protobuf_EnumO UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_mutable_enum_migrate(struct google_protobuf_EnumOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_MigrateAnnotation* sub = (struct xds_annotations_v3_MigrateAnnotation*)xds_annotations_v3_enum_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_MigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__MigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_enum_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_enum_value_migrate(const struct google_protobuf_EnumValueOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_enum_value_migrate_ext); } @@ -303,9 +330,18 @@ UPB_INLINE void xds_annotations_v3_set_enum_value_migrate(struct google_protobuf UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_mutable_enum_value_migrate(struct google_protobuf_EnumValueOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_MigrateAnnotation* sub = (struct xds_annotations_v3_MigrateAnnotation*)xds_annotations_v3_enum_value_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_MigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__MigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_enum_value_migrate(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_file_migrate(const struct google_protobuf_FileOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_file_migrate_ext); } @@ -327,9 +363,18 @@ UPB_INLINE void xds_annotations_v3_set_file_migrate(struct google_protobuf_FileO UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_mutable_file_migrate(struct google_protobuf_FileOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FileMigrateAnnotation* sub = (struct xds_annotations_v3_FileMigrateAnnotation*)xds_annotations_v3_file_migrate(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FileMigrateAnnotation*)_upb_Message_New(&xds__annotations__v3__FileMigrateAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_file_migrate(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c index 0ec954ec80..570b583b8f 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable xds__annotations__v3__MigrateAnnotation_msg_init = { NULL, &xds_annotations_v3_MigrateAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.MigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -36,6 +39,9 @@ const upb_MiniTable xds__annotations__v3__FieldMigrateAnnotation_msg_init = { NULL, &xds_annotations_v3_FieldMigrateAnnotation__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FieldMigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, @@ -52,6 +58,9 @@ const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init = { NULL, &xds_annotations_v3_FileMigrateAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FileMigrateAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h index 21321c4992..fe5581455e 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb.h @@ -90,11 +90,11 @@ UPB_INLINE bool xds_annotations_v3_FieldSecurityAnnotation_configure_for_untrust UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_set_configure_for_untrusted_downstream(xds_annotations_v3_FieldSecurityAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_annotations_v3_FieldSecurityAnnotation_set_configure_for_untrusted_upstream(xds_annotations_v3_FieldSecurityAnnotation *msg, bool value) { const upb_MiniTableField field = {2, 9, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool xds_annotations_v3_has_security(const struct google_protobuf_FieldOptions* msg) { @@ -118,9 +118,18 @@ UPB_INLINE void xds_annotations_v3_set_security(struct google_protobuf_FieldOpti UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_mutable_security(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FieldSecurityAnnotation* sub = (struct xds_annotations_v3_FieldSecurityAnnotation*)xds_annotations_v3_security(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FieldSecurityAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldSecurityAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_security(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c index 1bf8186264..a411f41bd3 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.c @@ -23,6 +23,9 @@ const upb_MiniTable xds__annotations__v3__FieldSecurityAnnotation_msg_init = { NULL, &xds_annotations_v3_FieldSecurityAnnotation__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FieldSecurityAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h index b9f504553b..4202d1329b 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb.h @@ -45,7 +45,7 @@ UPB_INLINE void xds_annotations_v3_set_sensitive(struct google_protobuf_FieldOpt UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_1Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h index 1206175340..867d46ff89 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb.h @@ -89,7 +89,7 @@ UPB_INLINE bool xds_annotations_v3_FileStatusAnnotation_work_in_progress(const x UPB_INLINE void xds_annotations_v3_FileStatusAnnotation_set_work_in_progress(xds_annotations_v3_FileStatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.MessageStatusAnnotation */ @@ -143,7 +143,7 @@ UPB_INLINE bool xds_annotations_v3_MessageStatusAnnotation_work_in_progress(cons UPB_INLINE void xds_annotations_v3_MessageStatusAnnotation_set_work_in_progress(xds_annotations_v3_MessageStatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.FieldStatusAnnotation */ @@ -197,7 +197,7 @@ UPB_INLINE bool xds_annotations_v3_FieldStatusAnnotation_work_in_progress(const UPB_INLINE void xds_annotations_v3_FieldStatusAnnotation_set_work_in_progress(xds_annotations_v3_FieldStatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.annotations.v3.StatusAnnotation */ @@ -263,11 +263,11 @@ UPB_INLINE int32_t xds_annotations_v3_StatusAnnotation_package_version_status(co UPB_INLINE void xds_annotations_v3_StatusAnnotation_set_work_in_progress(xds_annotations_v3_StatusAnnotation *msg, bool value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_annotations_v3_StatusAnnotation_set_package_version_status(xds_annotations_v3_StatusAnnotation *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool xds_annotations_v3_has_file_status(const struct google_protobuf_FileOptions* msg) { @@ -291,9 +291,18 @@ UPB_INLINE void xds_annotations_v3_set_file_status(struct google_protobuf_FileOp UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_mutable_file_status(struct google_protobuf_FileOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FileStatusAnnotation* sub = (struct xds_annotations_v3_FileStatusAnnotation*)xds_annotations_v3_file_status(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FileStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__FileStatusAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_file_status(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_message_status(const struct google_protobuf_MessageOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_message_status_ext); } @@ -315,9 +324,18 @@ UPB_INLINE void xds_annotations_v3_set_message_status(struct google_protobuf_Mes UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_mutable_message_status(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_MessageStatusAnnotation* sub = (struct xds_annotations_v3_MessageStatusAnnotation*)xds_annotations_v3_message_status(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_MessageStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__MessageStatusAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_message_status(msg, sub, arena); + } + return sub; +} UPB_INLINE bool xds_annotations_v3_has_field_status(const struct google_protobuf_FieldOptions* msg) { return upb_Message_HasExtension((upb_Message*)msg, &xds_annotations_v3_field_status_ext); } @@ -339,9 +357,18 @@ UPB_INLINE void xds_annotations_v3_set_field_status(struct google_protobuf_Field UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_mutable_field_status(struct google_protobuf_FieldOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_FieldStatusAnnotation* sub = (struct xds_annotations_v3_FieldStatusAnnotation*)xds_annotations_v3_field_status(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_FieldStatusAnnotation*)_upb_Message_New(&xds__annotations__v3__FieldStatusAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_field_status(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c index ff3dcf7a52..c8cab7e5a0 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable xds__annotations__v3__FileStatusAnnotation_msg_init = { NULL, &xds_annotations_v3_FileStatusAnnotation__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FileStatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -35,6 +38,9 @@ const upb_MiniTable xds__annotations__v3__MessageStatusAnnotation_msg_init = { NULL, &xds_annotations_v3_MessageStatusAnnotation__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.MessageStatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -49,6 +55,9 @@ const upb_MiniTable xds__annotations__v3__FieldStatusAnnotation_msg_init = { NULL, &xds_annotations_v3_FieldStatusAnnotation__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.FieldStatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, @@ -64,6 +73,9 @@ const upb_MiniTable xds__annotations__v3__StatusAnnotation_msg_init = { NULL, &xds_annotations_v3_StatusAnnotation__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.StatusAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psb1_1bt}, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h index 37015c4ad5..fb7184e38e 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb.h @@ -77,7 +77,7 @@ UPB_INLINE upb_StringView xds_annotations_v3_VersioningAnnotation_previous_messa UPB_INLINE void xds_annotations_v3_VersioningAnnotation_set_previous_message_type(xds_annotations_v3_VersioningAnnotation *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE bool xds_annotations_v3_has_versioning(const struct google_protobuf_MessageOptions* msg) { @@ -101,9 +101,18 @@ UPB_INLINE void xds_annotations_v3_set_versioning(struct google_protobuf_Message UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); - bool ok = _upb_Message_SetExtensionField((upb_Message*)msg, ext, &val, arena); + bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } +UPB_INLINE struct xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_mutable_versioning(struct google_protobuf_MessageOptions* msg, + upb_Arena* arena) { + struct xds_annotations_v3_VersioningAnnotation* sub = (struct xds_annotations_v3_VersioningAnnotation*)xds_annotations_v3_versioning(msg); + if (sub == NULL) { + sub = (struct xds_annotations_v3_VersioningAnnotation*)_upb_Message_New(&xds__annotations__v3__VersioningAnnotation_msg_init, arena); + if (sub) xds_annotations_v3_set_versioning(msg, sub, arena); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c index 209d9b96e6..3db8d2f343 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable xds__annotations__v3__VersioningAnnotation_msg_init = { NULL, &xds_annotations_v3_VersioningAnnotation__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.annotations.v3.VersioningAnnotation", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb.h b/src/core/ext/upb-gen/xds/core/v3/authority.upb.h index 339c035c80..9355bf2bf0 100644 --- a/src/core/ext/upb-gen/xds/core/v3/authority.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb.h @@ -77,7 +77,7 @@ UPB_INLINE upb_StringView xds_core_v3_Authority_name(const xds_core_v3_Authority UPB_INLINE void xds_core_v3_Authority_set_name(xds_core_v3_Authority *msg, upb_StringView value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c index e8d1a4fd7b..64456c1e22 100644 --- a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.c @@ -22,6 +22,9 @@ const upb_MiniTable xds__core__v3__Authority_msg_init = { NULL, &xds_core_v3_Authority__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.Authority", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h b/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h index 07c6c89176..bdecd9f387 100644 --- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb.h @@ -95,11 +95,11 @@ UPB_INLINE bool xds_core_v3_CidrRange_has_prefix_len(const xds_core_v3_CidrRange UPB_INLINE void xds_core_v3_CidrRange_set_address_prefix(xds_core_v3_CidrRange *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_CidrRange_set_prefix_len(xds_core_v3_CidrRange *msg, struct google_protobuf_UInt32Value* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_UInt32Value* xds_core_v3_CidrRange_mutable_prefix_len(xds_core_v3_CidrRange* msg, upb_Arena* arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)xds_core_v3_CidrRange_prefix_len(msg); diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c index f6db7cfd7c..d9a0b22a01 100644 --- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable xds__core__v3__CidrRange_msg_init = { &xds_core_v3_CidrRange_submsgs[0], &xds_core_v3_CidrRange__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.CidrRange", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h index 79f21a9525..e8329930b9 100644 --- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb.h @@ -112,7 +112,7 @@ UPB_INLINE bool xds_core_v3_CollectionEntry_has_inline_entry(const xds_core_v3_C UPB_INLINE void xds_core_v3_CollectionEntry_set_locator(xds_core_v3_CollectionEntry *msg, struct xds_core_v3_ResourceLocator* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -124,7 +124,7 @@ UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_CollectionEntry_mutab } UPB_INLINE void xds_core_v3_CollectionEntry_set_inline_entry(xds_core_v3_CollectionEntry *msg, xds_core_v3_CollectionEntry_InlineEntry* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -214,15 +214,15 @@ UPB_INLINE bool xds_core_v3_CollectionEntry_InlineEntry_has_resource(const xds_c UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_name(xds_core_v3_CollectionEntry_InlineEntry *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_version(xds_core_v3_CollectionEntry_InlineEntry *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_resource(xds_core_v3_CollectionEntry_InlineEntry *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 48), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c index c82d17e053..6c8e87593a 100644 --- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable xds__core__v3__CollectionEntry_msg_init = { &xds_core_v3_CollectionEntry_submsgs[0], &xds_core_v3_CollectionEntry__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.CollectionEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -52,6 +55,9 @@ const upb_MiniTable xds__core__v3__CollectionEntry__InlineEntry_msg_init = { &xds_core_v3_CollectionEntry_InlineEntry_submsgs[0], &xds_core_v3_CollectionEntry_InlineEntry__fields[0], UPB_SIZE(32, 56), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.CollectionEntry.InlineEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c index 23af64f7ce..4f074de292 100644 --- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.c @@ -25,6 +25,9 @@ const upb_MiniTable xds__core__v3__ContextParams_msg_init = { &xds_core_v3_ContextParams_submsgs[0], &xds_core_v3_ContextParams__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ContextParams", +#endif }; static const upb_MiniTableField xds_core_v3_ContextParams_ParamsEntry__fields[2] = { @@ -36,6 +39,9 @@ const upb_MiniTable xds__core__v3__ContextParams__ParamsEntry_msg_init = { NULL, &xds_core_v3_ContextParams_ParamsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ContextParams.ParamsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb.h b/src/core/ext/upb-gen/xds/core/v3/extension.upb.h index 70fa76ce3e..5411471196 100644 --- a/src/core/ext/upb-gen/xds/core/v3/extension.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb.h @@ -94,11 +94,11 @@ UPB_INLINE bool xds_core_v3_TypedExtensionConfig_has_typed_config(const xds_core UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_name(xds_core_v3_TypedExtensionConfig *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_TypedExtensionConfig_set_typed_config(xds_core_v3_TypedExtensionConfig *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_mutable_typed_config(xds_core_v3_TypedExtensionConfig* msg, upb_Arena* arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_TypedExtensionConfig_typed_config(msg); diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c index b96a04cb39..6ebd911796 100644 --- a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable xds__core__v3__TypedExtensionConfig_msg_init = { &xds_core_v3_TypedExtensionConfig_submsgs[0], &xds_core_v3_TypedExtensionConfig__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.TypedExtensionConfig", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource.upb.h index 6d188c4322..3bddecbb0a 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb.h @@ -112,7 +112,7 @@ UPB_INLINE bool xds_core_v3_Resource_has_resource(const xds_core_v3_Resource* ms UPB_INLINE void xds_core_v3_Resource_set_name(xds_core_v3_Resource *msg, struct xds_core_v3_ResourceName* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); @@ -124,11 +124,11 @@ UPB_INLINE struct xds_core_v3_ResourceName* xds_core_v3_Resource_mutable_name(xd } UPB_INLINE void xds_core_v3_Resource_set_version(xds_core_v3_Resource *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_Resource_set_resource(xds_core_v3_Resource *msg, struct google_protobuf_Any* value) { const upb_MiniTableField field = {3, UPB_SIZE(16, 40), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c index 4e71b3cf0a..15ba4b9dd2 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable xds__core__v3__Resource_msg_init = { &xds_core_v3_Resource_submsgs[0], &xds_core_v3_Resource__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.Resource", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h index 0e3b95331b..a5ad60883e 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb.h @@ -179,23 +179,23 @@ UPB_INLINE upb_Array* _xds_core_v3_ResourceLocator_directives_mutable_upb_array( UPB_INLINE void xds_core_v3_ResourceLocator_set_scheme(xds_core_v3_ResourceLocator *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsAlternate | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceLocator_set_id(xds_core_v3_ResourceLocator *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 16), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceLocator_set_authority(xds_core_v3_ResourceLocator *msg, upb_StringView value) { const upb_MiniTableField field = {3, 32, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceLocator_set_resource_type(xds_core_v3_ResourceLocator *msg, upb_StringView value) { const upb_MiniTableField field = {4, UPB_SIZE(40, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceLocator_set_exact_context(xds_core_v3_ResourceLocator *msg, struct xds_core_v3_ContextParams* value) { const upb_MiniTableField field = {5, UPB_SIZE(20, 72), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -317,7 +317,7 @@ UPB_INLINE bool xds_core_v3_ResourceLocator_Directive_has_entry(const xds_core_v UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_alt(xds_core_v3_ResourceLocator_Directive *msg, xds_core_v3_ResourceLocator* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } 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); @@ -329,7 +329,7 @@ UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_Direc } UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_entry(xds_core_v3_ResourceLocator_Directive *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c index 6c1887cb08..c46929c95d 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.c @@ -33,6 +33,9 @@ const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = { &xds_core_v3_ResourceLocator_submsgs[0], &xds_core_v3_ResourceLocator__fields[0], UPB_SIZE(48, 80), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ResourceLocator", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -58,6 +61,9 @@ const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init = { &xds_core_v3_ResourceLocator_Directive_submsgs[0], &xds_core_v3_ResourceLocator_Directive__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ResourceLocator.Directive", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max128b}, diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h index 8dbc106d7a..0b99122aaa 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb.h @@ -119,19 +119,19 @@ UPB_INLINE bool xds_core_v3_ResourceName_has_context(const xds_core_v3_ResourceN UPB_INLINE void xds_core_v3_ResourceName_set_id(xds_core_v3_ResourceName *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceName_set_authority(xds_core_v3_ResourceName *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(24, 32), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceName_set_resource_type(xds_core_v3_ResourceName *msg, upb_StringView value) { const upb_MiniTableField field = {3, UPB_SIZE(32, 48), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_core_v3_ResourceName_set_context(xds_core_v3_ResourceName *msg, struct xds_core_v3_ContextParams* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 64), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &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); diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c index c8ef95ba38..abba90d31a 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.c @@ -30,6 +30,9 @@ const upb_MiniTable xds__core__v3__ResourceName_msg_init = { &xds_core_v3_ResourceName_submsgs[0], &xds_core_v3_ResourceName__fields[0], UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.core.v3.ResourceName", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h index ad74a59e8b..f7d3384749 100644 --- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h +++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb.h @@ -226,15 +226,15 @@ UPB_INLINE double xds_data_orca_v3_OrcaLoadReport_application_utilization(const UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_cpu_utilization(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {1, UPB_SIZE(24, 8), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_mem_utilization(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {2, UPB_SIZE(32, 16), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_rps(xds_data_orca_v3_OrcaLoadReport *msg, uint64_t value) { const upb_MiniTableField field = {3, UPB_SIZE(40, 24), 0, kUpb_NoSub, 4, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_request_cost_clear(xds_data_orca_v3_OrcaLoadReport* msg) { const upb_MiniTableField field = {4, UPB_SIZE(8, 32), 0, 0, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -288,11 +288,11 @@ UPB_INLINE xds_data_orca_v3_OrcaLoadReport_UtilizationEntry* xds_data_orca_v3_Or } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_rps_fractional(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {6, 48, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_eps(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {7, 56, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_named_metrics_clear(xds_data_orca_v3_OrcaLoadReport* msg) { const upb_MiniTableField field = {8, UPB_SIZE(16, 64), 0, 2, 11, (int)kUpb_FieldMode_Map | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; @@ -321,7 +321,7 @@ UPB_INLINE xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry* xds_data_orca_v3_O } UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_set_application_utilization(xds_data_orca_v3_OrcaLoadReport *msg, double value) { const upb_MiniTableField field = {9, UPB_SIZE(64, 72), 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.data.orca.v3.OrcaLoadReport.RequestCostEntry */ diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c index 9b77741448..ebc43f2414 100644 --- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c @@ -35,6 +35,9 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport_msg_init = { &xds_data_orca_v3_OrcaLoadReport_submsgs[0], &xds_data_orca_v3_OrcaLoadReport__fields[0], UPB_SIZE(72, 80), 9, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(120), 0, +#ifdef UPB_TRACING_ENABLED + "xds.data.orca.v3.OrcaLoadReport", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, @@ -64,6 +67,9 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_in NULL, &xds_data_orca_v3_OrcaLoadReport_RequestCostEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.data.orca.v3.OrcaLoadReport.RequestCostEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -81,6 +87,9 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_in NULL, &xds_data_orca_v3_OrcaLoadReport_UtilizationEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.data.orca.v3.OrcaLoadReport.UtilizationEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, @@ -98,6 +107,9 @@ const upb_MiniTable xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_i NULL, &xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.data.orca.v3.OrcaLoadReport.NamedMetricsEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h index f6b9d554be..1251525374 100644 --- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h +++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h @@ -114,7 +114,7 @@ UPB_INLINE upb_Array* _xds_service_orca_v3_OrcaLoadReportRequest_request_cost_na UPB_INLINE void xds_service_orca_v3_OrcaLoadReportRequest_set_report_interval(xds_service_orca_v3_OrcaLoadReportRequest *msg, struct google_protobuf_Duration* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Duration* xds_service_orca_v3_OrcaLoadReportRequest_mutable_report_interval(xds_service_orca_v3_OrcaLoadReportRequest* msg, upb_Arena* arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)xds_service_orca_v3_OrcaLoadReportRequest_report_interval(msg); diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c index 4d1115488b..9966e81957 100644 --- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable xds__service__orca__v3__OrcaLoadReportRequest_msg_init = { &xds_service_orca_v3_OrcaLoadReportRequest_submsgs[0], &xds_service_orca_v3_OrcaLoadReportRequest__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.service.orca.v3.OrcaLoadReportRequest", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h index 31a8183b15..59677d3bfd 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb.h @@ -95,7 +95,7 @@ UPB_INLINE upb_StringView xds_type_matcher_v3_CelMatcher_description(const xds_t UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_expr_match(xds_type_matcher_v3_CelMatcher *msg, struct xds_type_v3_CelExpression* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatcher_mutable_expr_match(xds_type_matcher_v3_CelMatcher* msg, upb_Arena* arena) { struct xds_type_v3_CelExpression* sub = (struct xds_type_v3_CelExpression*)xds_type_matcher_v3_CelMatcher_expr_match(msg); @@ -107,7 +107,7 @@ UPB_INLINE struct xds_type_v3_CelExpression* xds_type_matcher_v3_CelMatcher_muta } UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_description(xds_type_matcher_v3_CelMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c index 454462a87b..cf4ef830b8 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable xds__type__matcher__v3__CelMatcher_msg_init = { &xds_type_matcher_v3_CelMatcher_submsgs[0], &xds_type_matcher_v3_CelMatcher__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.CelMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h index f8c3bde073..e422eb7dac 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb.h @@ -244,7 +244,7 @@ UPB_INLINE bool xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_add_domains( } UPB_INLINE void xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_set_on_match(xds_type_matcher_v3_ServerNameMatcher_DomainMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_mutable_on_match(xds_type_matcher_v3_ServerNameMatcher_DomainMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_on_match(msg); diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c index fe22f0af3d..70b99bb3c1 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = { &xds_type_matcher_v3_ServerNameMatcher_submsgs[0], &xds_type_matcher_v3_ServerNameMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.ServerNameMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -46,6 +49,9 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[0], &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.ServerNameMatcher.DomainMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prs_1bt}, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c index 5894814966..fa192d078e 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.c @@ -17,6 +17,9 @@ const upb_MiniTable xds__type__matcher__v3__HttpAttributesCelMatchInput_msg_init NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.HttpAttributesCelMatchInput", +#endif }; static const upb_MiniTable *messages_layout[1] = { diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h index ae1c695c82..19a72d7185 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb.h @@ -260,7 +260,7 @@ UPB_INLINE struct xds_core_v3_CidrRange* xds_type_matcher_v3_IPMatcher_IPRangeMa } UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_on_match(xds_type_matcher_v3_IPMatcher_IPRangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_IPMatcher_IPRangeMatcher_mutable_on_match(xds_type_matcher_v3_IPMatcher_IPRangeMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_IPMatcher_IPRangeMatcher_on_match(msg); @@ -272,7 +272,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_IPMat } UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_exclusive(xds_type_matcher_v3_IPMatcher_IPRangeMatcher *msg, bool value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 9), 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c index c79e418bae..7ec8ac3ee3 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.c @@ -28,6 +28,9 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = { &xds_type_matcher_v3_IPMatcher_submsgs[0], &xds_type_matcher_v3_IPMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.IPMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -49,6 +52,9 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init = &xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[0], &xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.IPMatcher.IPRangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h index 003d670688..1a79889304 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb.h @@ -136,7 +136,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_has_on_no_match(const xds_type_match UPB_INLINE void xds_type_matcher_v3_Matcher_set_matcher_list(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_MatcherList* value) { const upb_MiniTableField field = {1, UPB_SIZE(20, 24), -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_Matcher_mutable_matcher_list(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList*)xds_type_matcher_v3_Matcher_matcher_list(msg); @@ -148,7 +148,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList* xds_type_matcher_v3_M } UPB_INLINE void xds_type_matcher_v3_Matcher_set_matcher_tree(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_MatcherTree* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), -13, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_Matcher_mutable_matcher_tree(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherTree* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree*)xds_type_matcher_v3_Matcher_matcher_tree(msg); @@ -160,7 +160,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree* xds_type_matcher_v3_M } UPB_INLINE void xds_type_matcher_v3_Matcher_set_on_no_match(xds_type_matcher_v3_Matcher *msg, xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {3, 16, 64, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_mutable_on_no_match(xds_type_matcher_v3_Matcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Matcher_on_no_match(msg); @@ -252,7 +252,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_OnMatch_has_action(const xds_type_ma UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_set_matcher(xds_type_matcher_v3_Matcher_OnMatch *msg, xds_type_matcher_v3_Matcher* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMatch_mutable_matcher(xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher* sub = (struct xds_type_matcher_v3_Matcher*)xds_type_matcher_v3_Matcher_OnMatch_matcher(msg); @@ -264,7 +264,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher* xds_type_matcher_v3_Matcher_OnMat } UPB_INLINE void xds_type_matcher_v3_Matcher_OnMatch_set_action(xds_type_matcher_v3_Matcher_OnMatch *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_OnMatch_mutable_action(xds_type_matcher_v3_Matcher_OnMatch* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_OnMatch_action(msg); @@ -490,7 +490,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_has_not_matche UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_single_predicate(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_single_predicate(msg); @@ -502,7 +502,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredic } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_or_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_or_matcher(msg); @@ -514,7 +514,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateLis } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* value) { const upb_MiniTableField field = {3, UPB_SIZE(12, 16), -9, 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_and_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_and_matcher(msg); @@ -526,7 +526,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateLis } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_set_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate* value) { const upb_MiniTableField field = {4, UPB_SIZE(12, 16), -9, 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_Predicate_mutable_not_matcher(xds_type_matcher_v3_Matcher_MatcherList_Predicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_not_matcher(msg); @@ -634,7 +634,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicat UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_input(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_input(msg); @@ -646,7 +646,7 @@ UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_ } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_type_matcher_v3_StringMatcher* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_value_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct xds_type_matcher_v3_StringMatcher* sub = (struct xds_type_matcher_v3_StringMatcher*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_value_match(msg); @@ -658,7 +658,7 @@ UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_Matcher } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_set_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_mutable_custom_match(xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_custom_match(msg); @@ -840,7 +840,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_has_on_matc UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, xds_type_matcher_v3_Matcher_MatcherList_Predicate* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_predicate(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* sub = (struct xds_type_matcher_v3_Matcher_MatcherList_Predicate*)xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_predicate(msg); @@ -852,7 +852,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherList_Predicate* xds_type_ma } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_set_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher *msg, xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_mutable_on_match(xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_on_match(msg); @@ -977,7 +977,7 @@ UPB_INLINE bool xds_type_matcher_v3_Matcher_MatcherTree_has_custom_match(const x UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_input(xds_type_matcher_v3_Matcher_MatcherTree *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_mutable_input(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherTree_input(msg); @@ -989,7 +989,7 @@ UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_ } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree *msg, xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* value) { const upb_MiniTableField field = {2, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_mutable_exact_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)xds_type_matcher_v3_Matcher_MatcherTree_exact_match_map(msg); @@ -1001,7 +1001,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_mat } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree *msg, xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* value) { const upb_MiniTableField field = {3, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 2, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_matcher_v3_Matcher_MatcherTree_mutable_prefix_match_map(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* sub = (struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap*)xds_type_matcher_v3_Matcher_MatcherTree_prefix_match_map(msg); @@ -1013,7 +1013,7 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_MatcherTree_MatchMap* xds_type_mat } UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_set_custom_match(xds_type_matcher_v3_Matcher_MatcherTree *msg, struct xds_core_v3_TypedExtensionConfig* value) { const upb_MiniTableField field = {4, UPB_SIZE(20, 24), UPB_SIZE(-17, -13), 3, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_core_v3_TypedExtensionConfig* xds_type_matcher_v3_Matcher_MatcherTree_mutable_custom_match(xds_type_matcher_v3_Matcher_MatcherTree* msg, upb_Arena* arena) { struct xds_core_v3_TypedExtensionConfig* sub = (struct xds_core_v3_TypedExtensionConfig*)xds_type_matcher_v3_Matcher_MatcherTree_custom_match(msg); diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c index fd7f588ecc..f9abc865fd 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.c @@ -32,6 +32,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = { &xds_type_matcher_v3_Matcher_submsgs[0], &xds_type_matcher_v3_Matcher__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0018000c0100000a, &upb_pom_1bt_max64b}, @@ -54,6 +57,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = { &xds_type_matcher_v3_Matcher_OnMatch_submsgs[0], &xds_type_matcher_v3_Matcher_OnMatch__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.OnMatch", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -74,6 +80,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = { &xds_type_matcher_v3_Matcher_MatcherList_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -98,6 +107,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_ &xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList_Predicate__fields[0], UPB_SIZE(16, 24), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList.Predicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_max64b}, @@ -126,6 +138,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Sin &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList.Predicate.SinglePredicate", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -146,6 +161,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Pre &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList.Predicate.PredicateList", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -166,6 +184,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_m &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherList.FieldMatcher", +#endif }; static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = { @@ -186,6 +207,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = { &xds_type_matcher_v3_Matcher_MatcherTree_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherTree__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherTree", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, @@ -210,6 +234,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_i &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherTree.MatchMap", +#endif }; static const upb_MiniTableSub xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { @@ -225,6 +252,9 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapE &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0], &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__fields[0], 48, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Matcher.MatcherTree.MatchMap.MapEntry", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h index a53ce4171c..d90b2630d9 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb.h @@ -253,7 +253,7 @@ UPB_INLINE struct xds_type_v3_Int64Range* xds_type_matcher_v3_Int64RangeMatcher_ } UPB_INLINE void xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_on_match(msg); @@ -481,7 +481,7 @@ UPB_INLINE struct xds_type_v3_Int32Range* xds_type_matcher_v3_Int32RangeMatcher_ } UPB_INLINE void xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_on_match(msg); @@ -709,7 +709,7 @@ UPB_INLINE struct xds_type_v3_DoubleRange* xds_type_matcher_v3_DoubleRangeMatche } UPB_INLINE void xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_set_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher *msg, struct xds_type_matcher_v3_Matcher_OnMatch* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 64, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_mutable_on_match(xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_Matcher_OnMatch* sub = (struct xds_type_matcher_v3_Matcher_OnMatch*)xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_on_match(msg); diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c index ee96c92348..7efdcfa5f7 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.c @@ -27,6 +27,9 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = { &xds_type_matcher_v3_Int64RangeMatcher_submsgs[0], &xds_type_matcher_v3_Int64RangeMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Int64RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -47,6 +50,9 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_ &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[0], &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Int64RangeMatcher.RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, @@ -65,6 +71,9 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = { &xds_type_matcher_v3_Int32RangeMatcher_submsgs[0], &xds_type_matcher_v3_Int32RangeMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Int32RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -85,6 +94,9 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_ &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[0], &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.Int32RangeMatcher.RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, @@ -103,6 +115,9 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = { &xds_type_matcher_v3_DoubleRangeMatcher_submsgs[0], &xds_type_matcher_v3_DoubleRangeMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.DoubleRangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, @@ -123,6 +138,9 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[0], &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.DoubleRangeMatcher.RangeMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_prm_1bt_maxmaxb}, diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h index 6dcb755fed..0c0bec69b4 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb.h @@ -102,7 +102,7 @@ UPB_INLINE upb_StringView xds_type_matcher_v3_RegexMatcher_regex(const xds_type_ UPB_INLINE void xds_type_matcher_v3_RegexMatcher_set_google_re2(xds_type_matcher_v3_RegexMatcher *msg, xds_type_matcher_v3_RegexMatcher_GoogleRE2* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 32), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v3_RegexMatcher_mutable_google_re2(xds_type_matcher_v3_RegexMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* sub = (struct xds_type_matcher_v3_RegexMatcher_GoogleRE2*)xds_type_matcher_v3_RegexMatcher_google_re2(msg); @@ -114,7 +114,7 @@ UPB_INLINE struct xds_type_matcher_v3_RegexMatcher_GoogleRE2* xds_type_matcher_v } UPB_INLINE void xds_type_matcher_v3_RegexMatcher_set_regex(xds_type_matcher_v3_RegexMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.type.matcher.v3.RegexMatcher.GoogleRE2 */ diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c index 0817ae4afa..5e59b7a8be 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable xds__type__matcher__v3__RegexMatcher_msg_init = { &xds_type_matcher_v3_RegexMatcher_submsgs[0], &xds_type_matcher_v3_RegexMatcher__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.RegexMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x002000080100000a, &upb_pom_1bt_max64b}, @@ -38,6 +41,9 @@ const upb_MiniTable xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = { NULL, NULL, 8, 0, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.RegexMatcher.GoogleRE2", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h index ab137e83ba..17a8b31aba 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb.h @@ -172,19 +172,19 @@ UPB_INLINE bool xds_type_matcher_v3_StringMatcher_has_contains(const xds_type_ma UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_exact(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_prefix(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {2, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_suffix(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {3, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_safe_regex(xds_type_matcher_v3_StringMatcher *msg, struct xds_type_matcher_v3_RegexMatcher* value) { const upb_MiniTableField field = {5, 16, -13, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_StringMatcher_mutable_safe_regex(xds_type_matcher_v3_StringMatcher* msg, upb_Arena* arena) { struct xds_type_matcher_v3_RegexMatcher* sub = (struct xds_type_matcher_v3_RegexMatcher*)xds_type_matcher_v3_StringMatcher_safe_regex(msg); @@ -196,11 +196,11 @@ UPB_INLINE struct xds_type_matcher_v3_RegexMatcher* xds_type_matcher_v3_StringMa } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_ignore_case(xds_type_matcher_v3_StringMatcher *msg, bool value) { const upb_MiniTableField field = {6, 8, 0, kUpb_NoSub, 8, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_matcher_v3_StringMatcher_set_contains(xds_type_matcher_v3_StringMatcher *msg, upb_StringView value) { const upb_MiniTableField field = {7, 16, -13, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.type.matcher.v3.ListStringMatcher */ diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c index 1af3b33c9f..028473e84c 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = { &xds_type_matcher_v3_StringMatcher_submsgs[0], &xds_type_matcher_v3_StringMatcher__fields[0], UPB_SIZE(24, 32), 6, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.StringMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x0010000c0100000a, &upb_pos_1bt}, @@ -55,6 +58,9 @@ const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init = { &xds_type_matcher_v3_ListStringMatcher_submsgs[0], &xds_type_matcher_v3_ListStringMatcher__fields[0], 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.matcher.v3.ListStringMatcher", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f00000a, &upb_prm_1bt_max64b}, diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb.h b/src/core/ext/upb-gen/xds/type/v3/cel.upb.h index 153de8ebaf..6cb6070a2e 100644 --- a/src/core/ext/upb-gen/xds/type/v3/cel.upb.h +++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb.h @@ -114,7 +114,7 @@ UPB_INLINE bool xds_type_v3_CelExpression_has_checked_expr(const xds_type_v3_Cel UPB_INLINE void xds_type_v3_CelExpression_set_parsed_expr(xds_type_v3_CelExpression *msg, struct google_api_expr_v1alpha1_ParsedExpr* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), -9, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpression_mutable_parsed_expr(xds_type_v3_CelExpression* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_ParsedExpr* sub = (struct google_api_expr_v1alpha1_ParsedExpr*)xds_type_v3_CelExpression_parsed_expr(msg); @@ -126,7 +126,7 @@ UPB_INLINE struct google_api_expr_v1alpha1_ParsedExpr* xds_type_v3_CelExpression } UPB_INLINE void xds_type_v3_CelExpression_set_checked_expr(xds_type_v3_CelExpression *msg, struct google_api_expr_v1alpha1_CheckedExpr* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 16), -9, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_api_expr_v1alpha1_CheckedExpr* xds_type_v3_CelExpression_mutable_checked_expr(xds_type_v3_CelExpression* msg, upb_Arena* arena) { struct google_api_expr_v1alpha1_CheckedExpr* sub = (struct google_api_expr_v1alpha1_CheckedExpr*)xds_type_v3_CelExpression_checked_expr(msg); @@ -208,7 +208,7 @@ UPB_INLINE bool xds_type_v3_CelExtractString_has_default_value(const xds_type_v3 UPB_INLINE void xds_type_v3_CelExtractString_set_expr_extract(xds_type_v3_CelExtractString *msg, xds_type_v3_CelExpression* value) { const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct xds_type_v3_CelExpression* xds_type_v3_CelExtractString_mutable_expr_extract(xds_type_v3_CelExtractString* msg, upb_Arena* arena) { struct xds_type_v3_CelExpression* sub = (struct xds_type_v3_CelExpression*)xds_type_v3_CelExtractString_expr_extract(msg); @@ -220,7 +220,7 @@ UPB_INLINE struct xds_type_v3_CelExpression* xds_type_v3_CelExtractString_mutabl } UPB_INLINE void xds_type_v3_CelExtractString_set_default_value(xds_type_v3_CelExtractString *msg, struct google_protobuf_StringValue* value) { const upb_MiniTableField field = {2, UPB_SIZE(16, 24), 65, 1, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_StringValue* xds_type_v3_CelExtractString_mutable_default_value(xds_type_v3_CelExtractString* msg, upb_Arena* arena) { struct google_protobuf_StringValue* sub = (struct google_protobuf_StringValue*)xds_type_v3_CelExtractString_default_value(msg); diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c index fcc50fcea3..a4966c4561 100644 --- a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.c @@ -31,6 +31,9 @@ const upb_MiniTable xds__type__v3__CelExpression_msg_init = { &xds_type_v3_CelExpression_submsgs[0], &xds_type_v3_CelExpression__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.CelExpression", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000080100000a, &upb_pom_1bt_maxmaxb}, @@ -53,6 +56,9 @@ const upb_MiniTable xds__type__v3__CelExtractString_msg_init = { &xds_type_v3_CelExtractString_submsgs[0], &xds_type_v3_CelExtractString__fields[0], UPB_SIZE(24, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.CelExtractString", +#endif }; static const upb_MiniTable *messages_layout[2] = { diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb.h b/src/core/ext/upb-gen/xds/type/v3/range.upb.h index 06415a8d69..55515f71f1 100644 --- a/src/core/ext/upb-gen/xds/type/v3/range.upb.h +++ b/src/core/ext/upb-gen/xds/type/v3/range.upb.h @@ -88,11 +88,11 @@ UPB_INLINE int64_t xds_type_v3_Int64Range_end(const xds_type_v3_Int64Range* msg) UPB_INLINE void xds_type_v3_Int64Range_set_start(xds_type_v3_Int64Range *msg, int64_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_v3_Int64Range_set_end(xds_type_v3_Int64Range *msg, int64_t value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 3, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.type.v3.Int32Range */ @@ -158,11 +158,11 @@ UPB_INLINE int32_t xds_type_v3_Int32Range_end(const xds_type_v3_Int32Range* msg) UPB_INLINE void xds_type_v3_Int32Range_set_start(xds_type_v3_Int32Range *msg, int32_t value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_v3_Int32Range_set_end(xds_type_v3_Int32Range *msg, int32_t value) { const upb_MiniTableField field = {2, 12, 0, kUpb_NoSub, 5, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } /* xds.type.v3.DoubleRange */ @@ -228,11 +228,11 @@ UPB_INLINE double xds_type_v3_DoubleRange_end(const xds_type_v3_DoubleRange* msg UPB_INLINE void xds_type_v3_DoubleRange_set_start(xds_type_v3_DoubleRange *msg, double value) { const upb_MiniTableField field = {1, 8, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_v3_DoubleRange_set_end(xds_type_v3_DoubleRange *msg, double value) { const upb_MiniTableField field = {2, 16, 0, kUpb_NoSub, 1, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } #ifdef __cplusplus diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c index c9c1db8a67..ea6c37beb7 100644 --- a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.c @@ -21,6 +21,9 @@ const upb_MiniTable xds__type__v3__Int64Range_msg_init = { NULL, &xds_type_v3_Int64Range__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.Int64Range", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv8_1bt}, @@ -38,6 +41,9 @@ const upb_MiniTable xds__type__v3__Int32Range_msg_init = { NULL, &xds_type_v3_Int32Range__fields[0], 16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.Int32Range", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000008, &upb_psv4_1bt}, @@ -55,6 +61,9 @@ const upb_MiniTable xds__type__v3__DoubleRange_msg_init = { NULL, &xds_type_v3_DoubleRange__fields[0], 24, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.DoubleRange", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x000800003f000009, &upb_psf8_1bt}, diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h index ece0269781..067c0051b9 100644 --- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h +++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb.h @@ -93,11 +93,11 @@ UPB_INLINE bool xds_type_v3_TypedStruct_has_value(const xds_type_v3_TypedStruct* UPB_INLINE void xds_type_v3_TypedStruct_set_type_url(xds_type_v3_TypedStruct *msg, upb_StringView value) { const upb_MiniTableField field = {1, 16, 0, kUpb_NoSub, 9, (int)kUpb_FieldMode_Scalar | ((int)kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE void xds_type_v3_TypedStruct_set_value(xds_type_v3_TypedStruct *msg, struct google_protobuf_Struct* value) { const upb_MiniTableField field = {2, UPB_SIZE(12, 32), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}; - _upb_Message_SetNonExtensionField((upb_Message *)msg, &field, &value); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); } UPB_INLINE struct google_protobuf_Struct* xds_type_v3_TypedStruct_mutable_value(xds_type_v3_TypedStruct* msg, upb_Arena* arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)xds_type_v3_TypedStruct_value(msg); diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c index 5d8123db08..bb9826d214 100644 --- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c +++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.c @@ -26,6 +26,9 @@ const upb_MiniTable xds__type__v3__TypedStruct_msg_init = { &xds_type_v3_TypedStruct_submsgs[0], &xds_type_v3_TypedStruct__fields[0], UPB_SIZE(24, 40), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(8), 0, +#ifdef UPB_TRACING_ENABLED + "xds.type.v3.TypedStruct", +#endif UPB_FASTTABLE_INIT({ {0x0000000000000000, &_upb_FastDecoder_DecodeGeneric}, {0x001000003f00000a, &upb_pss_1bt}, diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c index 9e9cd9db90..a6f5a44f71 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.c @@ -13,7 +13,7 @@ extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; -static const char descriptor[2736] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', '/', 's', 'e', 'r', 'v', 'e', 'r', '_', 'i', +static const char descriptor[2867] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', '/', 's', 'e', 'r', 'v', 'e', 'r', '_', 'i', 'n', 'f', 'o', '.', 'p', 'r', 'o', 't', 'o', '\022', '\016', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', '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', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', @@ -41,88 +41,93 @@ static const char descriptor[2736] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', ' '\020', '\000', '\022', '\014', '\n', '\010', 'D', 'R', 'A', 'I', 'N', 'I', 'N', 'G', '\020', '\001', '\022', '\024', '\n', '\020', 'P', 'R', 'E', '_', 'I', 'N', 'I', 'T', 'I', 'A', 'L', 'I', 'Z', 'I', 'N', 'G', '\020', '\002', '\022', '\020', '\n', '\014', 'I', 'N', 'I', 'T', 'I', 'A', 'L', 'I', 'Z', 'I', 'N', 'G', '\020', '\003', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', -'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 'e', 'r', 'v', 'e', 'r', 'I', 'n', 'f', 'o', '\"', '\333', '\016', '\n', '\022', +'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 'e', 'r', 'v', 'e', 'r', 'I', 'n', 'f', 'o', '\"', '\336', '\017', '\n', '\022', 'C', 'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\027', '\n', '\007', 'b', 'a', 's', 'e', '_', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\004', 'R', '\006', 'b', 'a', 's', 'e', 'I', 'd', '\022', '-', '\n', '\023', 'u', 's', 'e', '_', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'b', 'a', 's', 'e', '_', 'i', 'd', '\030', '\037', ' ', '\001', '(', '\010', 'R', '\020', 'u', -'s', 'e', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'B', 'a', 's', 'e', 'I', 'd', '\022', ' ', '\n', '\014', 'b', 'a', 's', 'e', '_', 'i', -'d', '_', 'p', 'a', 't', 'h', '\030', ' ', ' ', '\001', '(', '\t', 'R', '\n', 'b', 'a', 's', 'e', 'I', 'd', 'P', 'a', 't', 'h', '\022', -' ', '\n', '\013', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', '\030', '\002', ' ', '\001', '(', '\r', 'R', '\013', 'c', 'o', 'n', -'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', '\022', '\037', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'p', 'a', 't', 'h', '\030', '\003', -' ', '\001', '(', '\t', 'R', '\n', 'c', 'o', 'n', 'f', 'i', 'g', 'P', 'a', 't', 'h', '\022', '\037', '\n', '\013', 'c', 'o', 'n', 'f', 'i', -'g', '_', 'y', 'a', 'm', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\n', 'c', 'o', 'n', 'f', 'i', 'g', 'Y', 'a', 'm', 'l', '\022', -'=', '\n', '\033', 'a', 'l', 'l', 'o', 'w', '_', 'u', 'n', 'k', 'n', 'o', 'w', 'n', '_', 's', 't', 'a', 't', 'i', 'c', '_', 'f', -'i', 'e', 'l', 'd', 's', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\030', 'a', 'l', 'l', 'o', 'w', 'U', 'n', 'k', 'n', 'o', 'w', 'n', -'S', 't', 'a', 't', 'i', 'c', 'F', 'i', 'e', 'l', 'd', 's', '\022', 'A', '\n', '\035', 'r', 'e', 'j', 'e', 'c', 't', '_', 'u', 'n', -'k', 'n', 'o', 'w', 'n', '_', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\032', ' ', '\001', '(', -'\010', 'R', '\032', 'r', 'e', 'j', 'e', 'c', 't', 'U', 'n', 'k', 'n', 'o', 'w', 'n', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'F', 'i', -'e', 'l', 'd', 's', '\022', 'A', '\n', '\035', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'u', 'n', 'k', 'n', 'o', 'w', 'n', '_', 'd', 'y', -'n', 'a', 'm', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\036', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'g', 'n', 'o', 'r', -'e', 'U', 'n', 'k', 'n', 'o', 'w', 'n', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'F', 'i', 'e', 'l', 'd', 's', '\022', ',', '\n', '\022', -'a', 'd', 'm', 'i', 'n', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'p', 'a', 't', 'h', '\030', '\006', ' ', '\001', '(', '\t', 'R', -'\020', 'a', 'd', 'm', 'i', 'n', 'A', 'd', 'd', 'r', 'e', 's', 's', 'P', 'a', 't', 'h', '\022', 'e', '\n', '\030', 'l', 'o', 'c', 'a', -'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'i', 'p', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\001', '(', -'\016', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'a', 'n', -'d', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'I', 'p', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\025', 'l', -'o', 'c', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'I', 'p', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\033', '\n', '\t', 'l', -'o', 'g', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'g', 'L', 'e', 'v', 'e', 'l', '\022', -'.', '\n', '\023', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\t', ' ', -'\001', '(', '\t', 'R', '\021', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 'L', 'o', 'g', 'L', 'e', 'v', 'e', 'l', '\022', '\035', '\n', -'\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\t', 'l', 'o', 'g', 'F', 'o', 'r', -'m', 'a', 't', '\022', ',', '\n', '\022', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '_', 'e', 's', 'c', 'a', 'p', 'e', 'd', -'\030', '\033', ' ', '\001', '(', '\010', 'R', '\020', 'l', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', 'E', 's', 'c', 'a', 'p', 'e', 'd', '\022', -'\031', '\n', '\010', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\007', 'l', 'o', 'g', 'P', 'a', 't', -'h', '\022', '\'', '\n', '\017', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\r', ' ', '\001', '(', -'\t', 'R', '\016', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', -'i', 'c', 'e', '_', 'n', 'o', 'd', 'e', '\030', '\016', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'o', -'d', 'e', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'z', 'o', 'n', 'e', '\030', '\017', ' ', '\001', '(', '\t', 'R', -'\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'Z', 'o', 'n', 'e', '\022', 'I', '\n', '\023', 'f', 'i', 'l', 'e', '_', 'f', 'l', 'u', 's', -'h', '_', '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', 'R', '\021', 'f', 'i', 'l', 'e', 'F', -'l', 'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '8', '\n', '\n', 'd', 'r', 'a', 'i', 'n', '_', 't', 'i', 'm', -'e', '\030', '\021', ' ', '\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', '\t', 'd', 'r', 'a', 'i', 'n', 'T', 'i', 'm', 'e', '\022', 'W', '\n', '\016', 'd', -'r', 'a', 'i', 'n', '_', 's', 't', 'r', 'a', 't', 'e', 'g', 'y', '\030', '!', ' ', '\001', '(', '\016', '2', '0', '.', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', -'t', 'i', 'o', 'n', 's', '.', 'D', 'r', 'a', 'i', 'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', 'R', '\r', 'd', 'r', 'a', 'i', -'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', '\022', 'K', '\n', '\024', 'p', 'a', 'r', 'e', 'n', 't', '_', 's', 'h', 'u', 't', 'd', -'o', 'w', 'n', '_', 't', 'i', 'm', 'e', '\030', '\022', ' ', '\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', '\022', 'p', 'a', 'r', 'e', 'n', 't', 'S', -'h', 'u', 't', 'd', 'o', 'w', 'n', 'T', 'i', 'm', 'e', '\022', ';', '\n', '\004', 'm', 'o', 'd', 'e', '\030', '\023', ' ', '\001', '(', '\016', -'2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'a', 'n', 'd', -'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'M', 'o', 'd', 'e', 'R', '\004', 'm', 'o', 'd', 'e', '\022', '.', '\n', -'\023', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'h', 'o', 't', '_', 'r', 'e', 's', 't', 'a', 'r', 't', '\030', '\026', ' ', '\001', '(', -'\010', 'R', '\021', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'H', 'o', 't', 'R', 'e', 's', 't', 'a', 'r', 't', '\022', '0', '\n', '\024', 'e', -'n', 'a', 'b', 'l', 'e', '_', 'm', 'u', 't', 'e', 'x', '_', 't', 'r', 'a', 'c', 'i', 'n', 'g', '\030', '\027', ' ', '\001', '(', '\010', -'R', '\022', 'e', 'n', 'a', 'b', 'l', 'e', 'M', 'u', 't', 'e', 'x', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', '#', '\n', '\r', 'r', -'e', 's', 't', 'a', 'r', 't', '_', 'e', 'p', 'o', 'c', 'h', '\030', '\030', ' ', '\001', '(', '\r', 'R', '\014', 'r', 'e', 's', 't', 'a', -'r', 't', 'E', 'p', 'o', 'c', 'h', '\022', '%', '\n', '\016', 'c', 'p', 'u', 's', 'e', 't', '_', 't', 'h', 'r', 'e', 'a', 'd', 's', -'\030', '\031', ' ', '\001', '(', '\010', 'R', '\r', 'c', 'p', 'u', 's', 'e', 't', 'T', 'h', 'r', 'e', 'a', 'd', 's', '\022', '/', '\n', '\023', -'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\030', '\034', ' ', '\003', '(', '\t', -'R', '\022', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\022', '9', '\n', '\031', 'e', -'n', 'a', 'b', 'l', 'e', '_', 'f', 'i', 'n', 'e', '_', 'g', 'r', 'a', 'i', 'n', '_', 'l', 'o', 'g', 'g', 'i', 'n', 'g', '\030', -'\"', ' ', '\001', '(', '\010', 'R', '\026', 'e', 'n', 'a', 'b', 'l', 'e', 'F', 'i', 'n', 'e', 'G', 'r', 'a', 'i', 'n', 'L', 'o', 'g', -'g', 'i', 'n', 'g', '\022', '\037', '\n', '\013', 's', 'o', 'c', 'k', 'e', 't', '_', 'p', 'a', 't', 'h', '\030', '#', ' ', '\001', '(', '\t', -'R', '\n', 's', 'o', 'c', 'k', 'e', 't', 'P', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'o', -'d', 'e', '\030', '$', ' ', '\001', '(', '\r', 'R', '\n', 's', 'o', 'c', 'k', 'e', 't', 'M', 'o', 'd', 'e', '\022', '(', '\n', '\020', 'e', -'n', 'a', 'b', 'l', 'e', '_', 'c', 'o', 'r', 'e', '_', 'd', 'u', 'm', 'p', '\030', '%', ' ', '\001', '(', '\010', 'R', '\016', 'e', 'n', -'a', 'b', 'l', 'e', 'C', 'o', 'r', 'e', 'D', 'u', 'm', 'p', '\022', '\033', '\n', '\t', 's', 't', 'a', 't', 's', '_', 't', 'a', 'g', -'\030', '&', ' ', '\003', '(', '\t', 'R', '\010', 's', 't', 'a', 't', 's', 'T', 'a', 'g', '\"', '\033', '\n', '\t', 'I', 'p', 'V', 'e', 'r', -'s', 'i', 'o', 'n', '\022', '\006', '\n', '\002', 'v', '4', '\020', '\000', '\022', '\006', '\n', '\002', 'v', '6', '\020', '\001', '\"', '-', '\n', '\004', 'M', -'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 'e', 'r', 'v', 'e', '\020', '\000', '\022', '\014', '\n', '\010', 'V', 'a', 'l', 'i', 'd', 'a', 't', -'e', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'n', 'i', 't', 'O', 'n', 'l', 'y', '\020', '\002', '\"', '+', '\n', '\r', 'D', 'r', 'a', 'i', -'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', '\022', '\013', '\n', '\007', 'G', 'r', 'a', 'd', 'u', 'a', 'l', '\020', '\000', '\022', '\r', '\n', -'\t', 'I', 'm', 'm', 'e', 'd', 'i', 'a', 't', 'e', '\020', '\001', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', -'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\024', '\020', '\025', 'J', '\004', '\010', '\025', -'\020', '\026', 'J', '\004', '\010', '\035', '\020', '\036', 'R', '\t', 'm', 'a', 'x', '_', 's', 't', 'a', 't', 's', 'R', '\020', 'm', 'a', 'x', '_', -'o', 'b', 'j', '_', 'n', 'a', 'm', 'e', '_', 'l', 'e', 'n', 'R', '\021', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '_', 'v', -'e', 'r', 's', 'i', 'o', 'n', 'B', 'x', '\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', 'S', 'e', 'r', 'v', 'e', 'r', 'I', 'n', 'f', 'o', -'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '=', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', -'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', ';', 'a', 'd', 'm', 'i', 'n', 'v', '3', '\272', '\200', '\310', '\321', '\006', -'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'s', 'e', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'B', 'a', 's', 'e', 'I', 'd', '\022', '?', '\n', '\035', 's', 'k', 'i', 'p', '_', 'h', +'o', 't', '_', 'r', 'e', 's', 't', 'a', 'r', 't', '_', 'o', 'n', '_', 'n', 'o', '_', 'p', 'a', 'r', 'e', 'n', 't', '\030', '\'', +' ', '\001', '(', '\010', 'R', '\030', 's', 'k', 'i', 'p', 'H', 'o', 't', 'R', 'e', 's', 't', 'a', 'r', 't', 'O', 'n', 'N', 'o', 'P', +'a', 'r', 'e', 'n', 't', '\022', '@', '\n', '\035', 's', 'k', 'i', 'p', '_', 'h', 'o', 't', '_', 'r', 'e', 's', 't', 'a', 'r', 't', +'_', 'p', 'a', 'r', 'e', 'n', 't', '_', 's', 't', 'a', 't', 's', '\030', '(', ' ', '\001', '(', '\010', 'R', '\031', 's', 'k', 'i', 'p', +'H', 'o', 't', 'R', 'e', 's', 't', 'a', 'r', 't', 'P', 'a', 'r', 'e', 'n', 't', 'S', 't', 'a', 't', 's', '\022', ' ', '\n', '\014', +'b', 'a', 's', 'e', '_', 'i', 'd', '_', 'p', 'a', 't', 'h', '\030', ' ', ' ', '\001', '(', '\t', 'R', '\n', 'b', 'a', 's', 'e', 'I', +'d', 'P', 'a', 't', 'h', '\022', ' ', '\n', '\013', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', '\030', '\002', ' ', '\001', '(', +'\r', 'R', '\013', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', '\022', '\037', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', +'p', 'a', 't', 'h', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\n', 'c', 'o', 'n', 'f', 'i', 'g', 'P', 'a', 't', 'h', '\022', '\037', '\n', +'\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'y', 'a', 'm', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\n', 'c', 'o', 'n', 'f', 'i', +'g', 'Y', 'a', 'm', 'l', '\022', '=', '\n', '\033', 'a', 'l', 'l', 'o', 'w', '_', 'u', 'n', 'k', 'n', 'o', 'w', 'n', '_', 's', 't', +'a', 't', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\030', 'a', 'l', 'l', 'o', 'w', 'U', +'n', 'k', 'n', 'o', 'w', 'n', 'S', 't', 'a', 't', 'i', 'c', 'F', 'i', 'e', 'l', 'd', 's', '\022', 'A', '\n', '\035', 'r', 'e', 'j', +'e', 'c', 't', '_', 'u', 'n', 'k', 'n', 'o', 'w', 'n', '_', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', +'s', '\030', '\032', ' ', '\001', '(', '\010', 'R', '\032', 'r', 'e', 'j', 'e', 'c', 't', 'U', 'n', 'k', 'n', 'o', 'w', 'n', 'D', 'y', 'n', +'a', 'm', 'i', 'c', 'F', 'i', 'e', 'l', 'd', 's', '\022', 'A', '\n', '\035', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'u', 'n', 'k', 'n', +'o', 'w', 'n', '_', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\036', ' ', '\001', '(', '\010', 'R', +'\032', 'i', 'g', 'n', 'o', 'r', 'e', 'U', 'n', 'k', 'n', 'o', 'w', 'n', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'F', 'i', 'e', 'l', +'d', 's', '\022', ',', '\n', '\022', 'a', 'd', 'm', 'i', 'n', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'p', 'a', 't', 'h', '\030', +'\006', ' ', '\001', '(', '\t', 'R', '\020', 'a', 'd', 'm', 'i', 'n', 'A', 'd', 'd', 'r', 'e', 's', 's', 'P', 'a', 't', 'h', '\022', 'e', +'\n', '\030', 'l', 'o', 'c', 'a', 'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'i', 'p', '_', 'v', 'e', 'r', 's', 'i', 'o', +'n', '\030', '\007', ' ', '\001', '(', '\016', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', +'C', 'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'I', 'p', 'V', 'e', 'r', 's', +'i', 'o', 'n', 'R', '\025', 'l', 'o', 'c', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'I', 'p', 'V', 'e', 'r', 's', 'i', 'o', +'n', '\022', '\033', '\n', '\t', 'l', 'o', 'g', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'g', +'L', 'e', 'v', 'e', 'l', '\022', '.', '\n', '\023', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'l', 'e', +'v', 'e', 'l', '\030', '\t', ' ', '\001', '(', '\t', 'R', '\021', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 'L', 'o', 'g', 'L', 'e', +'v', 'e', 'l', '\022', '\035', '\n', '\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\t', +'l', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\022', ',', '\n', '\022', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '_', 'e', +'s', 'c', 'a', 'p', 'e', 'd', '\030', '\033', ' ', '\001', '(', '\010', 'R', '\020', 'l', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', 'E', 's', +'c', 'a', 'p', 'e', 'd', '\022', '\031', '\n', '\010', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\007', +'l', 'o', 'g', 'P', 'a', 't', 'h', '\022', '\'', '\n', '\017', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', +'r', '\030', '\r', ' ', '\001', '(', '\t', 'R', '\016', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '!', +'\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'o', 'd', 'e', '\030', '\016', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', +'v', 'i', 'c', 'e', 'N', 'o', 'd', 'e', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'z', 'o', 'n', 'e', '\030', +'\017', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'Z', 'o', 'n', 'e', '\022', 'I', '\n', '\023', 'f', 'i', 'l', +'e', '_', 'f', 'l', 'u', 's', 'h', '_', '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', 'R', +'\021', 'f', 'i', 'l', 'e', 'F', 'l', 'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '8', '\n', '\n', 'd', 'r', 'a', +'i', 'n', '_', 't', 'i', 'm', 'e', '\030', '\021', ' ', '\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', '\t', 'd', 'r', 'a', 'i', 'n', 'T', 'i', 'm', +'e', '\022', 'W', '\n', '\016', 'd', 'r', 'a', 'i', 'n', '_', 's', 't', 'r', 'a', 't', 'e', 'g', 'y', '\030', '!', ' ', '\001', '(', '\016', +'2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'a', 'n', 'd', +'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'D', 'r', 'a', 'i', 'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', +'R', '\r', 'd', 'r', 'a', 'i', 'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', '\022', 'K', '\n', '\024', 'p', 'a', 'r', 'e', 'n', 't', +'_', 's', 'h', 'u', 't', 'd', 'o', 'w', 'n', '_', 't', 'i', 'm', 'e', '\030', '\022', ' ', '\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', '\022', 'p', +'a', 'r', 'e', 'n', 't', 'S', 'h', 'u', 't', 'd', 'o', 'w', 'n', 'T', 'i', 'm', 'e', '\022', ';', '\n', '\004', 'm', 'o', 'd', 'e', +'\030', '\023', ' ', '\001', '(', '\016', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', +'o', 'm', 'm', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'M', 'o', 'd', 'e', 'R', '\004', 'm', +'o', 'd', 'e', '\022', '.', '\n', '\023', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'h', 'o', 't', '_', 'r', 'e', 's', 't', 'a', 'r', +'t', '\030', '\026', ' ', '\001', '(', '\010', 'R', '\021', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'H', 'o', 't', 'R', 'e', 's', 't', 'a', 'r', +'t', '\022', '0', '\n', '\024', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'm', 'u', 't', 'e', 'x', '_', 't', 'r', 'a', 'c', 'i', 'n', 'g', +'\030', '\027', ' ', '\001', '(', '\010', 'R', '\022', 'e', 'n', 'a', 'b', 'l', 'e', 'M', 'u', 't', 'e', 'x', 'T', 'r', 'a', 'c', 'i', 'n', +'g', '\022', '#', '\n', '\r', 'r', 'e', 's', 't', 'a', 'r', 't', '_', 'e', 'p', 'o', 'c', 'h', '\030', '\030', ' ', '\001', '(', '\r', 'R', +'\014', 'r', 'e', 's', 't', 'a', 'r', 't', 'E', 'p', 'o', 'c', 'h', '\022', '%', '\n', '\016', 'c', 'p', 'u', 's', 'e', 't', '_', 't', +'h', 'r', 'e', 'a', 'd', 's', '\030', '\031', ' ', '\001', '(', '\010', 'R', '\r', 'c', 'p', 'u', 's', 'e', 't', 'T', 'h', 'r', 'e', 'a', +'d', 's', '\022', '/', '\n', '\023', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', +'\030', '\034', ' ', '\003', '(', '\t', 'R', '\022', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'s', '\022', '9', '\n', '\031', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'f', 'i', 'n', 'e', '_', 'g', 'r', 'a', 'i', 'n', '_', 'l', 'o', +'g', 'g', 'i', 'n', 'g', '\030', '\"', ' ', '\001', '(', '\010', 'R', '\026', 'e', 'n', 'a', 'b', 'l', 'e', 'F', 'i', 'n', 'e', 'G', 'r', +'a', 'i', 'n', 'L', 'o', 'g', 'g', 'i', 'n', 'g', '\022', '\037', '\n', '\013', 's', 'o', 'c', 'k', 'e', 't', '_', 'p', 'a', 't', 'h', +'\030', '#', ' ', '\001', '(', '\t', 'R', '\n', 's', 'o', 'c', 'k', 'e', 't', 'P', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'c', +'k', 'e', 't', '_', 'm', 'o', 'd', 'e', '\030', '$', ' ', '\001', '(', '\r', 'R', '\n', 's', 'o', 'c', 'k', 'e', 't', 'M', 'o', 'd', +'e', '\022', '(', '\n', '\020', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'c', 'o', 'r', 'e', '_', 'd', 'u', 'm', 'p', '\030', '%', ' ', '\001', +'(', '\010', 'R', '\016', 'e', 'n', 'a', 'b', 'l', 'e', 'C', 'o', 'r', 'e', 'D', 'u', 'm', 'p', '\022', '\033', '\n', '\t', 's', 't', 'a', +'t', 's', '_', 't', 'a', 'g', '\030', '&', ' ', '\003', '(', '\t', 'R', '\010', 's', 't', 'a', 't', 's', 'T', 'a', 'g', '\"', '\033', '\n', +'\t', 'I', 'p', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\006', '\n', '\002', 'v', '4', '\020', '\000', '\022', '\006', '\n', '\002', 'v', '6', '\020', +'\001', '\"', '-', '\n', '\004', 'M', 'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 'e', 'r', 'v', 'e', '\020', '\000', '\022', '\014', '\n', '\010', 'V', +'a', 'l', 'i', 'd', 'a', 't', 'e', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'n', 'i', 't', 'O', 'n', 'l', 'y', '\020', '\002', '\"', '+', +'\n', '\r', 'D', 'r', 'a', 'i', 'n', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', '\022', '\013', '\n', '\007', 'G', 'r', 'a', 'd', 'u', 'a', +'l', '\020', '\000', '\022', '\r', '\n', '\t', 'I', 'm', 'm', 'e', 'd', 'i', 'a', 't', 'e', '\020', '\001', ':', '-', '\232', '\305', '\210', '\036', '(', +'\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'o', 'm', +'m', 'a', 'n', 'd', 'L', 'i', 'n', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\024', +'\020', '\025', 'J', '\004', '\010', '\025', '\020', '\026', 'J', '\004', '\010', '\035', '\020', '\036', 'R', '\t', 'm', 'a', 'x', '_', 's', 't', 'a', 't', 's', +'R', '\020', 'm', 'a', 'x', '_', 'o', 'b', 'j', '_', 'n', 'a', 'm', 'e', '_', 'l', 'e', 'n', 'R', '\021', 'b', 'o', 'o', 't', 's', +'t', 'r', 'a', 'p', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'B', 'x', '\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', 'S', 'e', 'r', 'v', +'e', 'r', 'I', 'n', 'f', 'o', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '=', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', +'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', +'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', ';', 'a', 'd', 'm', 'i', 'n', 'v', +'3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[5] = { @@ -137,5 +142,5 @@ _upb_DefPool_Init envoy_admin_v3_server_info_proto_upbdefinit = { deps, &envoy_admin_v3_server_info_proto_upb_file_layout, "envoy/admin/v3/server_info.proto", - UPB_STRINGVIEW_INIT(descriptor, 2736) + UPB_STRINGVIEW_INIT(descriptor, 2867) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c index 844eec40c7..a129c5f33f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.c @@ -19,7 +19,7 @@ extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4747] = {'\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[4752] = {'\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', @@ -151,64 +151,65 @@ static const char descriptor[4747] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', ' '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', '\"', '\365', '\001', '\n', '\022', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', -'\022', '\242', '\001', '\n', '\005', 'f', 'l', 'a', 'g', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\213', '\001', '\372', 'B', '\207', '\001', '\222', '\001', -'\203', '\001', '\"', '\200', '\001', 'r', '~', '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', '\003', 'U', 'P', 'E', 'R', '\002', 'N', 'C', 'R', '\002', 'O', 'M', -'R', '\002', 'D', 'F', 'R', '\002', 'D', 'O', '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', '\"', 'v', '\n', '\r', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'F', 'i', 'l', -'t', 'e', 'r', '\022', 'K', '\n', '\005', 't', 'y', 'p', 'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '&', '.', 'e', 'n', 'v', 'o', -'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', -'s', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\005', -'t', 'y', 'p', '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', '\"', '\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', '\221', '\001', '\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', 'Z', 'L', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', -'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'e', 'r', '\"', '\372', '\001', '\n', '\022', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', +'\022', '\247', '\001', '\n', '\005', 'f', 'l', 'a', 'g', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\220', '\001', '\372', 'B', '\214', '\001', '\222', '\001', +'\210', '\001', '\"', '\205', '\001', 'r', '\202', '\001', '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', '\003', 'U', 'P', 'E', 'R', '\002', 'N', 'C', 'R', '\002', 'O', +'M', 'R', '\002', 'D', 'F', 'R', '\002', 'D', 'O', 'R', '\002', 'D', 'R', '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', '\"', 'v', '\n', '\r', 'L', 'o', 'g', 'T', 'y', +'p', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'K', '\n', '\005', 't', 'y', 'p', 'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '&', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', +'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 'p', 'e', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', +'\002', '\020', '\001', 'R', '\005', 't', 'y', 'p', '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', '\"', '\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', '\221', '\001', '\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', 'Z', 'L', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', +'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', +'o', '3', }; static _upb_DefPool_Init *deps[11] = { @@ -229,5 +230,5 @@ _upb_DefPool_Init envoy_config_accesslog_v3_accesslog_proto_upbdefinit = { deps, &envoy_config_accesslog_v3_accesslog_proto_upb_file_layout, "envoy/config/accesslog/v3/accesslog.proto", - UPB_STRINGVIEW_INIT(descriptor, 4747) + UPB_STRINGVIEW_INIT(descriptor, 4752) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c index 06d6abbaf7..0d6b80ec6e 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.c @@ -33,7 +33,7 @@ extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[9320] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '/', +static const char descriptor[9581] = {'\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', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 'a', 'c', @@ -71,7 +71,7 @@ static const char descriptor[9320] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', ' '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', '\"', '\254', '#', '\n', '\t', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', +'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\231', '$', '\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', @@ -197,215 +197,226 @@ static const char descriptor[9320] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', ' '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', '.', 'G', 'r', 'p', 'c', 'A', 's', 'y', 'n', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\034', 'g', 'r', 'p', 'c', 'A', 's', 'y', 'n', 'c', 'C', -'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\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', -'\371', '\001', '\n', '\024', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'L', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', '\022', -'b', '\n', '\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', 'C', '.', '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', '.', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'L', 'o', 'g', 'C', 'o', 'n', -'f', 'i', 'g', '.', 'L', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', 'R', '\t', 'l', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\032', -'}', '\n', '\t', 'L', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\022', ':', '\n', '\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', -'a', 't', '\030', '\001', ' ', '\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', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', '!', '\n', -'\013', 't', 'e', 'x', 't', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\n', 't', 'e', 'x', -'t', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\021', '\n', '\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\022', '\003', '\370', 'B', -'\001', '\032', 'Z', '\n', '\023', 'D', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'S', 't', 'a', 't', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', -'C', '\n', '\036', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'd', 'e', 'f', 'e', 'r', 'r', 'e', 'd', '_', 'c', 'r', 'e', 'a', 't', 'i', -'o', 'n', '_', 's', 't', 'a', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\033', 'e', 'n', 'a', 'b', 'l', 'e', 'D', 'e', 'f', -'e', 'r', 'r', 'e', 'd', 'C', 'r', 'e', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 's', '\032', '\211', '\001', '\n', '\034', 'G', 'r', -'p', 'c', 'A', 's', 'y', 'n', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', -'g', '\022', 'i', '\n', '\036', 'm', 'a', 'x', '_', 'c', 'a', 'c', 'h', 'e', 'd', '_', 'e', 'n', 't', 'r', 'y', '_', 'i', 'd', 'l', -'e', '_', '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', 'B', '\n', '\372', 'B', '\007', '\252', '\001', -'\004', '2', '\002', '\010', '\005', 'R', '\032', 'm', 'a', 'x', 'C', 'a', 'c', 'h', 'e', 'd', 'E', 'n', 't', 'r', 'y', 'I', 'd', 'l', 'e', -'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\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', '\"', '\211', '\003', '\n', '\005', 'A', 'd', 'm', 'i', 'n', '\022', 'C', -'\n', '\n', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '\030', '\005', ' ', '\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', '3', '\n', '\017', 'a', 'c', 'c', 'e', -'s', 's', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', -'\004', '\003', '3', '.', '0', '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', '\022', '7', '\n', '\030', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'g', 'l', -'o', 'b', 'a', 'l', '_', 'c', 'o', 'n', 'n', '_', 'l', 'i', 'm', 'i', 't', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\025', 'i', 'g', -'n', 'o', 'r', 'e', 'G', 'l', 'o', 'b', 'a', 'l', 'C', 'o', 'n', 'n', 'L', 'i', 'm', 'i', 't', ':', '&', '\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', '\"', '\224', '\005', '\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', '\022', 'G', '\n', ' ', -'e', 'n', 'a', 'b', 'l', 'e', '_', 'd', 'e', 'f', 'e', 'r', 'r', 'e', 'd', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'c', -'r', 'e', 'a', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\035', 'e', 'n', 'a', 'b', 'l', 'e', 'D', 'e', 'f', 'e', -'r', 'r', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'r', 'e', 'a', 't', 'i', 'o', 'n', '\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', +'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'k', '\n', '\030', 'm', 'e', 'm', +'o', 'r', 'y', '_', 'a', 'l', 'l', 'o', 'c', 'a', 't', 'o', 'r', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', ')', ' ', '\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', '.', 'M', 'e', 'm', 'o', 'r', 'y', 'A', 'l', 'l', 'o', 'c', 'a', 't', 'o', 'r', 'M', 'a', 'n', 'a', +'g', 'e', 'r', 'R', '\026', 'm', 'e', 'm', 'o', 'r', 'y', 'A', 'l', 'l', 'o', 'c', 'a', 't', 'o', 'r', 'M', 'a', 'n', 'a', 'g', +'e', 'r', '\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', '\371', '\001', '\n', '\024', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'L', +'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'b', '\n', '\n', 'l', 'o', 'g', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', +'\001', '(', '\013', '2', 'C', '.', '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', '.', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', +'i', 'o', 'n', 'L', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', 'R', '\t', 'l', +'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\032', '}', '\n', '\t', 'L', 'o', 'g', 'F', 'o', 'r', 'm', 'a', 't', '\022', ':', '\n', '\013', +'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\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', '\n', 'j', 's', 'o', 'n', +'F', 'o', 'r', 'm', 'a', 't', '\022', '!', '\n', '\013', 't', 'e', 'x', 't', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', +'(', '\t', 'H', '\000', 'R', '\n', 't', 'e', 'x', 't', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\021', '\n', '\n', 'l', 'o', 'g', '_', 'f', +'o', 'r', 'm', 'a', 't', '\022', '\003', '\370', 'B', '\001', '\032', 'Z', '\n', '\023', 'D', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'S', 't', 'a', +'t', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'C', '\n', '\036', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'd', 'e', 'f', 'e', 'r', 'r', +'e', 'd', '_', 'c', 'r', 'e', 'a', 't', 'i', 'o', 'n', '_', 's', 't', 'a', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\033', +'e', 'n', 'a', 'b', 'l', 'e', 'D', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'C', 'r', 'e', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', +'t', 's', '\032', '\211', '\001', '\n', '\034', 'G', 'r', 'p', 'c', 'A', 's', 'y', 'n', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'M', 'a', 'n', +'a', 'g', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'i', '\n', '\036', 'm', 'a', 'x', '_', 'c', 'a', 'c', 'h', 'e', 'd', '_', +'e', 'n', 't', 'r', 'y', '_', 'i', 'd', 'l', 'e', '_', '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', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '2', '\002', '\010', '\005', 'R', '\032', 'm', 'a', 'x', 'C', 'a', 'c', 'h', 'e', 'd', +'E', 'n', 't', 'r', 'y', 'I', 'd', 'l', 'e', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\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', '\"', '\211', '\003', +'\n', '\005', 'A', 'd', 'm', 'i', 'n', '\022', 'C', '\n', '\n', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '\030', '\005', ' ', '\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', '3', '\n', '\017', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', +'\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', '\022', '7', '\n', '\030', +'i', 'g', 'n', 'o', 'r', 'e', '_', 'g', 'l', 'o', 'b', 'a', 'l', '_', 'c', 'o', 'n', 'n', '_', 'l', 'i', 'm', 'i', 't', '\030', +'\006', ' ', '\001', '(', '\010', 'R', '\025', 'i', 'g', 'n', 'o', 'r', 'e', 'G', 'l', 'o', 'b', 'a', 'l', 'C', 'o', 'n', 'n', 'L', 'i', +'m', 'i', 't', ':', '&', '\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', '\"', '\224', '\005', '\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', '\022', 'G', '\n', ' ', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'd', 'e', 'f', 'e', 'r', 'r', 'e', 'd', '_', +'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'c', 'r', 'e', 'a', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\035', 'e', +'n', 'a', 'b', 'l', 'e', 'D', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'r', 'e', 'a', 't', +'i', 'o', 'n', '\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', '.', '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', '#', +'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', '.', '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', '\"', '\261', '\002', '\n', '\022', 'C', 'u', 's', 't', 'o', 'm', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', -'a', 'd', 'e', 'r', '\022', ';', '\n', '\022', 'i', 'n', 'l', 'i', 'n', 'e', '_', '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', '\020', 'i', -'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'v', '\n', '\022', 'i', 'n', 'l', 'i', 'n', 'e', -'_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 't', 'y', 'p', 'e', '\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', '.', 'C', 'u', 's', -'t', 'o', 'm', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '.', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', -'d', 'e', 'r', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\020', 'i', 'n', 'l', 'i', 'n', 'e', -'H', 'e', 'a', 'd', 'e', 'r', 'T', 'y', 'p', 'e', '\"', 'f', '\n', '\020', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', -'r', 'T', 'y', 'p', 'e', '\022', '\022', '\n', '\016', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', '\000', -'\022', '\023', '\n', '\017', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '_', 'T', 'R', 'A', 'I', 'L', 'E', 'R', '\020', '\001', '\022', '\023', '\n', '\017', -'R', 'E', 'S', 'P', 'O', 'N', 'S', 'E', '_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', '\002', '\022', '\024', '\n', '\020', 'R', 'E', 'S', 'P', -'O', 'N', 'S', 'E', '_', 'T', 'R', 'A', 'I', 'L', 'E', 'R', '\020', '\003', 'B', '\221', '\001', '\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', 'Z', 'L', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', -'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'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', '\"', '\261', '\002', '\n', '\022', 'C', 'u', 's', 't', 'o', +'m', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '\022', ';', '\n', '\022', 'i', 'n', 'l', 'i', 'n', 'e', '_', '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', '\020', 'i', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', +'v', '\n', '\022', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 't', 'y', 'p', 'e', '\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', '.', 'C', 'u', 's', 't', 'o', 'm', 'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '.', +'I', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', +'\001', 'R', '\020', 'i', 'n', 'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'y', 'p', 'e', '\"', 'f', '\n', '\020', 'I', 'n', +'l', 'i', 'n', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '\022', '\n', '\016', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', +'_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', '\000', '\022', '\023', '\n', '\017', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '_', 'T', 'R', 'A', 'I', +'L', 'E', 'R', '\020', '\001', '\022', '\023', '\n', '\017', 'R', 'E', 'S', 'P', 'O', 'N', 'S', 'E', '_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', +'\002', '\022', '\024', '\n', '\020', 'R', 'E', 'S', 'P', 'O', 'N', 'S', 'E', '_', 'T', 'R', 'A', 'I', 'L', 'E', 'R', '\020', '\003', '\"', '\225', +'\001', '\n', '\026', 'M', 'e', 'm', 'o', 'r', 'y', 'A', 'l', 'l', 'o', 'c', 'a', 't', 'o', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', +'\022', '(', '\n', '\020', 'b', 'y', 't', 'e', 's', '_', 't', 'o', '_', 'r', 'e', 'l', 'e', 'a', 's', 'e', '\030', '\001', ' ', '\001', '(', +'\004', 'R', '\016', 'b', 'y', 't', 'e', 's', 'T', 'o', 'R', 'e', 'l', 'e', 'a', 's', 'e', '\022', 'Q', '\n', '\027', 'm', 'e', 'm', 'o', +'r', 'y', '_', 'r', 'e', 'l', 'e', 'a', 's', 'e', '_', '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', 'R', '\025', 'm', 'e', 'm', 'o', 'r', 'y', 'R', 'e', 'l', 'e', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', +'B', '\221', '\001', '\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', 'Z', 'L', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', +'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', +'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', +'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[25] = { @@ -440,5 +451,5 @@ _upb_DefPool_Init envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit = { deps, &envoy_config_bootstrap_v3_bootstrap_proto_upb_file_layout, "envoy/config/bootstrap/v3/bootstrap.proto", - UPB_STRINGVIEW_INIT(descriptor, 9320) + UPB_STRINGVIEW_INIT(descriptor, 9581) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h index 0d54bf0f88..3f79363928 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/bootstrap/v3/bootstrap.upbdefs.h @@ -128,6 +128,11 @@ UPB_INLINE const upb_MessageDef *envoy_config_bootstrap_v3_CustomInlineHeader_ge return upb_DefPool_FindMessageByName(s, "envoy.config.bootstrap.v3.CustomInlineHeader"); } +UPB_INLINE const upb_MessageDef *envoy_config_bootstrap_v3_MemoryAllocatorManager_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.bootstrap.v3.MemoryAllocatorManager"); +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c index fe64938bb3..7fa62797ac 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.c @@ -33,7 +33,7 @@ extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[12560] = {'\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[13073] = {'\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', @@ -72,7 +72,7 @@ static const char descriptor[12560] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', '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', '\"', '\227', +'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\"', '\326', 'S', '\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', @@ -241,301 +241,321 @@ static const char descriptor[12560] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', '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', '?', '\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', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', -'.', '0', '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', '\244', '\n', '\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', +'r', 's', 'S', 'e', 'r', 'v', 'e', 'r', '\022', '=', '\n', '\033', 'l', 'r', 's', '_', 'r', 'e', 'p', 'o', 'r', 't', '_', 'e', 'n', +'d', 'p', 'o', 'i', 'n', 't', '_', 'm', 'e', 't', 'r', 'i', 'c', 's', '\030', '9', ' ', '\003', '(', '\t', 'R', '\030', 'l', 'r', 's', +'R', 'e', 'p', 'o', 'r', 't', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'M', 'e', 't', 'r', 'i', 'c', 's', '\022', '?', '\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', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', '\244', '\n', '\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', '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', '\022', '\222', '\001', '\n', '\030', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'f', 'a', 'l', 'l', -'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\010', ' ', '\001', '(', '\016', '2', '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', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', -'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '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', '\026', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', -'P', 'o', 'l', 'i', 'c', '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', '\"', 'M', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', -'t', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\030', -'\n', '\024', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', '_', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', -'\021', '\n', '\r', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '_', 'L', 'I', 'S', 'T', '\020', '\001', ':', '*', '\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', '\343', '\001', '\n', '\017', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', -'t', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'w', 'i', 'n', -'d', 'o', 'w', '\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', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'W', 'i', 'n', -'d', 'o', 'w', '\022', 'C', '\n', '\n', 'a', 'g', 'g', 'r', 'e', 's', 's', 'i', 'o', 'n', '\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', '\n', 'a', 'g', 'g', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'D', '\n', -'\022', 'm', 'i', 'n', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '\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', -'\020', 'm', 'i', 'n', 'W', 'e', 'i', 'g', 'h', 't', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\032', 'r', '\n', '\022', 'R', 'o', 'u', 'n', -'d', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', -'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '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', -'.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', -'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\305', '\002', '\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', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', -'_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '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', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', -'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', ':', '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', 'Y', '\n', '\016', 'M', 'a', 'g', 'l', 'e', 'v', -'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'G', '\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', 'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\313', '\226', '\261', '\002', 'R', '\t', 't', 'a', 'b', -'l', 'e', 'S', 'i', 'z', 'e', '\032', '\277', '\002', '\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', '\022', '(', '\n', '\020', 'h', -'t', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\016', 'h', 't', -'t', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', ']', '\n', '\026', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', -'p', 'o', 'r', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\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', -'\t', '\372', 'B', '\006', '*', '\004', '\030', '\377', '\377', '\003', 'R', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'r', 't', 'O', -'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'F', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'k', 'e', 'y', '\030', '\004', -' ', '\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', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', 'K', 'e', 'y', ':', '/', '\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', '\325', '\013', '\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', '\022', -'W', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 'h', 'o', 's', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\010', -' ', '\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', 'S', 't', 'a', 't', 'u', 's', 'S', 'e', 't', 'R', '\022', 'o', 'v', 'e', 'r', 'r', -'i', 'd', 'e', 'H', 'o', 's', 't', 'S', 't', 'a', 't', 'u', 's', '\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', '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', '\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', '\"', 'P', '\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', '\022', '\020', '\n', '\014', 'V', '4', '_', 'P', 'R', 'E', 'F', -'E', 'R', 'R', 'E', 'D', '\020', '\003', '\022', '\007', '\n', '\003', 'A', 'L', 'L', '\020', '\004', '\"', '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', '\"', '\332', -'\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', '\310', '\001', '\n', '\006', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '`', '\n', '\026', 't', 'y', 'p', 'e', 'd', '_', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', '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', '.', 'T', 'y', 'p', 'e', 'd', -'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', -'e', 'n', 's', 'i', 'o', 'n', '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', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', -'\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'R', '\004', 'n', 'a', 'm', 'e', 'R', '\014', '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', '\"', '\371', '\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', -'\022', 'd', '\n', '0', 's', 'e', 't', '_', 'l', 'o', 'c', 'a', 'l', '_', 'i', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', '_', 'n', -'a', 'm', 'e', '_', 'o', 'n', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', -'n', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '*', 's', 'e', 't', 'L', 'o', 'c', 'a', 'l', 'I', 'n', 't', 'e', 'r', 'f', 'a', -'c', 'e', 'N', 'a', 'm', 'e', 'O', 'n', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', -'n', 's', ':', '-', '\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', '\"', -'\240', '\001', '\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', '\022', ',', '\n', '\022', 'p', 'e', 'r', '_', 'e', -'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 't', 's', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\020', 'p', 'e', 'r', 'E', -'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', 'B', '\211', '\001', '\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', 'Z', 'H', 'g', 'i', 't', -'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', -'t', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', -'\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'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', '\022', '\222', '\001', '\n', '\030', +'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', +'\010', ' ', '\001', '(', '\016', '2', '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', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', +'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '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', '\026', 'm', 'e', 't', +'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', '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', '\"', 'M', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'a', 'l', +'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\030', '\n', '\024', 'M', 'E', 'T', 'A', 'D', 'A', 'T', 'A', '_', 'N', +'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', '\021', '\n', '\r', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '_', +'L', 'I', 'S', 'T', '\020', '\001', ':', '*', '\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', '\343', '\001', '\n', '\017', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\021', 's', +'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\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', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 'C', '\n', '\n', 'a', 'g', 'g', 'r', 'e', +'s', 's', 'i', 'o', 'n', '\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', '\n', +'a', 'g', 'g', 'r', 'e', 's', 's', 'i', 'o', 'n', '\022', 'D', '\n', '\022', 'm', 'i', 'n', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', +'p', 'e', 'r', 'c', 'e', 'n', 't', '\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', '\020', 'm', 'i', 'n', 'W', 'e', 'i', 'g', 'h', 't', 'P', 'e', +'r', 'c', 'e', 'n', 't', '\032', 'r', '\n', '\022', 'R', 'o', 'u', 'n', 'd', 'R', 'o', 'b', 'i', 'n', 'L', 'b', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', +' ', '\001', '(', '\013', '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', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', +'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\305', '\002', '\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', '\022', '\\', '\n', '\021', 's', 'l', 'o', 'w', '_', 's', 't', 'a', 'r', 't', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\003', ' ', '\001', '(', '\013', '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', '.', 'S', 'l', 'o', 'w', 'S', 't', 'a', 'r', +'t', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 's', 'l', 'o', 'w', 'S', 't', 'a', 'r', 't', 'C', 'o', 'n', 'f', 'i', 'g', ':', +'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', 'Y', '\n', '\016', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'G', '\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', 'B', '\n', '\372', 'B', +'\007', '2', '\005', '\030', '\313', '\226', '\261', '\002', 'R', '\t', 't', 'a', 'b', 'l', 'e', 'S', 'i', 'z', 'e', '\032', '\277', '\002', '\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', '\022', '(', '\n', '\020', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', +'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\016', 'h', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', +'\022', ']', '\n', '\026', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'o', 'r', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', +'e', '\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', '\t', '\372', 'B', '\006', '*', '\004', '\030', '\377', '\377', '\003', 'R', '\024', +'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'r', 't', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'F', '\n', '\014', 'm', +'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'k', 'e', 'y', '\030', '\004', ' ', '\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', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', ':', '/', '\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', '\325', '\013', '\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', '\022', 'W', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', +'h', 'o', 's', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\010', ' ', '\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', 'S', 't', 'a', +'t', 'u', 's', 'S', 'e', 't', 'R', '\022', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'H', 'o', 's', 't', 'S', 't', 'a', 't', 'u', +'s', '\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', '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', '\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', '\"', 'P', '\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', '\022', '\020', '\n', '\014', 'V', '4', '_', 'P', 'R', 'E', 'F', 'E', 'R', 'R', 'E', 'D', '\020', '\003', '\022', '\007', '\n', '\003', 'A', +'L', 'L', '\020', '\004', '\"', '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', '\"', '\332', '\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', '\310', '\001', '\n', '\006', 'P', 'o', 'l', 'i', +'c', 'y', '\022', '`', '\n', '\026', 't', 'y', 'p', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', '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', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', +'f', 'i', 'g', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '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', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'R', +'\004', 'n', 'a', 'm', 'e', 'R', '\014', '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', '\"', '\273', '\005', '\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', '\022', 'd', '\n', '0', 's', 'e', 't', '_', 'l', 'o', 'c', 'a', +'l', '_', 'i', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', '_', 'n', 'a', 'm', 'e', '_', 'o', 'n', '_', 'u', 'p', 's', 't', 'r', +'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '*', 's', 'e', +'t', 'L', 'o', 'c', 'a', 'l', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 'N', 'a', 'm', 'e', 'O', 'n', 'U', 'p', 's', 't', +'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\022', 'z', '\n', '\025', 'h', 'a', 'p', 'p', 'y', '_', +'e', 'y', 'e', 'b', 'a', 'l', 'l', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 'F', '.', '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', '.', 'H', +'a', 'p', 'p', 'y', 'E', 'y', 'e', 'b', 'a', 'l', 'l', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\023', 'h', 'a', 'p', 'p', 'y', +'E', 'y', 'e', 'b', 'a', 'l', 'l', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\211', '\002', '\n', '\023', 'H', 'a', 'p', 'p', 'y', 'E', +'y', 'e', 'b', 'a', 'l', 'l', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\215', '\001', '\n', '\034', 'f', 'i', 'r', 's', 't', '_', 'a', +'d', 'd', 'r', 'e', 's', 's', '_', 'f', 'a', 'm', 'i', 'l', 'y', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', +'(', '\016', '2', 'L', '.', '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', '.', 'F', 'i', 'r', 's', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', 'F', 'a', 'm', 'i', 'l', 'y', 'V', 'e', +'r', 's', 'i', 'o', 'n', 'R', '\031', 'f', 'i', 'r', 's', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', 'F', 'a', 'm', 'i', 'l', 'y', +'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', 'b', '\n', '\032', 'f', 'i', 'r', 's', 't', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', +'f', 'a', 'm', 'i', 'l', 'y', '_', 'c', 'o', 'u', 'n', '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', 'B', '\007', +'\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\027', 'f', 'i', 'r', 's', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', 'F', 'a', 'm', 'i', +'l', 'y', 'C', 'o', 'u', 'n', 't', '\"', '8', '\n', '\031', 'F', 'i', 'r', 's', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', 'F', 'a', +'m', 'i', 'l', 'y', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\013', '\n', '\007', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', +'\006', '\n', '\002', 'V', '4', '\020', '\001', '\022', '\006', '\n', '\002', 'V', '6', '\020', '\002', ':', '-', '\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', '\"', '\240', '\001', '\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', '\022', ',', '\n', '\022', 'p', 'e', 'r', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 't', +'s', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\020', 'p', 'e', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', +'B', '\211', '\001', '\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', 'Z', 'H', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', +'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[25] = { @@ -570,5 +590,5 @@ _upb_DefPool_Init envoy_config_cluster_v3_cluster_proto_upbdefinit = { deps, &envoy_config_cluster_v3_cluster_proto_upb_file_layout, "envoy/config/cluster/v3/cluster.proto", - UPB_STRINGVIEW_INIT(descriptor, 12560) + UPB_STRINGVIEW_INIT(descriptor, 13073) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h index 33f27333e6..fc2d1a9899 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/cluster.upbdefs.h @@ -133,6 +133,11 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_UpstreamConnectionOptio return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.UpstreamConnectionOptions"); } +UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.UpstreamConnectionOptions.HappyEyeballsConfig"); +} + UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_TrackClusterStats_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.cluster.v3.TrackClusterStats"); diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c index b2ba276046..d651d3d7ab 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.c @@ -9,123 +9,132 @@ #include "envoy/config/cluster/v3/outlier_detection.upbdefs.h" #include "envoy/config/cluster/v3/outlier_detection.upb_minitable.h" +extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[2703] = {'\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[2892] = {'\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', -'.', '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', '\"', '\212', '\022', '\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', -'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', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'Q', '\n', '\022', 'b', 'a', 's', 'e', '_', 'e', 'j', 'e', 'c', 't', -'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '\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', 'R', '\020', 'b', 'a', 's', 'e', 'E', 'j', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', '\022', 'W', '\n', '\024', 'm', 'a', -'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '\030', '\004', ' ', '\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', '.', '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', '\"', '\241', '\023', '\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', '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', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', +'Q', '\n', '\022', 'b', 'a', 's', 'e', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '\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', 'R', '\020', 'b', 'a', 's', 'e', 'E', 'j', 'e', 'c', 't', +'i', 'o', 'n', 'T', 'i', 'm', 'e', '\022', 'W', '\n', '\024', 'm', 'a', 'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', +'e', 'r', 'c', 'e', 'n', 't', '\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', '\007', '\372', 'B', '\004', '*', '\002', '\030', +'d', 'R', '\022', 'm', 'a', 'x', 'E', 'j', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'a', '\n', '\031', +'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', '5', 'x', 'x', +'\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', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\027', 'e', 'n', 'f', +'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '5', 'x', 'x', '\022', '[', '\n', '\026', 'e', +'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\024', 'e', 'n', 'f', 'o', 'r', 'c', 'i', +'n', 'g', 'S', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', '\022', 'Y', '\n', '\032', 's', 'u', 'c', 'c', 'e', 's', 's', '_', +'r', 'a', 't', 'e', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'h', 'o', 's', 't', 's', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\022', 'm', 'a', 'x', 'E', 'j', 'e', 'c', 't', 'i', 'o', -'n', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'a', '\n', '\031', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', -'s', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', '5', 'x', 'x', '\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', -'\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\027', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', -'t', 'i', 'v', 'e', '5', 'x', 'x', '\022', '[', '\n', '\026', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 's', 'u', 'c', 'c', -'e', 's', 's', '_', 'r', 'a', 't', 'e', '\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', 'B', '\007', '\372', 'B', '\004', '*', -'\002', '\030', 'd', 'R', '\024', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'S', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', -'\022', 'Y', '\n', '\032', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', -'h', 'o', 's', 't', 's', '\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', '\027', 's', 'u', 'c', 'c', 'e', 's', 's', -'R', 'a', 't', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm', 'H', 'o', 's', 't', 's', '\022', '[', '\n', '\033', 's', 'u', 'c', 'c', 'e', -'s', 's', '_', 'r', 'a', 't', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'v', 'o', 'l', 'u', 'm', 'e', '\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', 'R', '\030', 's', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', 'R', 'e', 'q', 'u', -'e', 's', 't', 'V', 'o', 'l', 'u', 'm', 'e', '\022', 'W', '\n', '\031', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', -'_', 's', 't', 'd', 'e', 'v', '_', 'f', 'a', 'c', 't', 'o', 'r', '\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', -'\026', 's', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', 'S', 't', 'd', 'e', 'v', 'F', 'a', 'c', 't', 'o', 'r', '\022', '\\', -'\n', '\033', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'g', 'a', 't', 'e', 'w', 'a', 'y', '_', 'f', 'a', 'i', -'l', 'u', 'r', 'e', '\030', '\n', ' ', '\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', '\031', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', -'i', 'v', 'e', 'G', 'a', 't', 'e', 'w', 'a', 'y', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', 'x', '\n', '%', 'e', 'n', 'f', 'o', -'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'g', 'a', 't', 'e', 'w', 'a', 'y', -'_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\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', 'B', '\007', '\372', 'B', '\004', '*', -'\002', '\030', 'd', 'R', '\"', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', -'G', 'a', 't', 'e', 'w', 'a', 'y', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', 'J', '\n', '\"', 's', 'p', 'l', 'i', 't', '_', 'e', -'x', 't', 'e', 'r', 'n', 'a', 'l', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'e', 'r', 'r', 'o', -'r', 's', '\030', '\014', ' ', '\001', '(', '\010', 'R', '\036', 's', 'p', 'l', 'i', 't', 'E', 'x', 't', 'e', 'r', 'n', 'a', 'l', 'L', 'o', -'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'E', 'r', 'r', 'o', 'r', 's', '\022', 'e', '\n', ' ', 'c', 'o', 'n', 's', 'e', 'c', -'u', 't', 'i', 'v', 'e', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', -'e', '\030', '\r', ' ', '\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', '\035', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', -'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', '\201', '\001', '\n', '*', 'e', 'n', -'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'l', 'o', 'c', 'a', 'l', -'_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\016', ' ', '\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', 'd', 'R', '&', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', -'e', 'c', 'u', 't', 'i', 'v', 'e', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', -'\022', 's', '\n', '#', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', -'n', '_', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '\030', '\017', ' ', '\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', 'd', 'R', '\037', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'L', 'o', 'c', 'a', 'l', -'O', 'r', 'i', 'g', 'i', 'n', 'S', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', '\022', 'g', '\n', '\034', 'f', 'a', 'i', 'l', -'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\032', 'f', 'a', 'i', 'l', -'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'g', '\n', -'\034', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', -'t', 'a', 'g', 'e', '\030', '\021', ' ', '\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', 'd', 'R', -'\032', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', -'g', 'e', '\022', '\177', '\n', ')', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', -'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '%', 'e', 'n', 'f', 'o', 'r', 'c', -'i', 'n', 'g', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'L', 'o', 'c', 'a', 'l', -'O', 'r', 'i', 'g', 'i', 'n', '\022', 'e', '\n', ' ', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', -'a', 'g', 'e', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'h', 'o', 's', 't', 's', '\030', '\023', ' ', '\001', '(', '\013', '2', '\034', +'a', 'l', 'u', 'e', 'R', '\027', 's', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm', 'H', +'o', 's', 't', 's', '\022', '[', '\n', '\033', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '_', 'r', 'e', 'q', 'u', +'e', 's', 't', '_', 'v', 'o', 'l', 'u', 'm', 'e', '\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', 'R', '\030', 's', 'u', +'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'V', 'o', 'l', 'u', 'm', 'e', '\022', 'W', '\n', +'\031', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', 't', 'e', '_', 's', 't', 'd', 'e', 'v', '_', 'f', 'a', 'c', 't', 'o', +'r', '\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', '\026', 's', 'u', 'c', 'c', 'e', 's', 's', 'R', 'a', 't', 'e', +'S', 't', 'd', 'e', 'v', 'F', 'a', 'c', 't', 'o', 'r', '\022', '\\', '\n', '\033', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', +'e', '_', 'g', 'a', 't', 'e', 'w', 'a', 'y', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\n', ' ', '\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', '\035', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'M', 'i', 'n', -'i', 'm', 'u', 'm', 'H', 'o', 's', 't', 's', '\022', 'g', '\n', '!', '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', '\030', '\024', ' ', '\001', +'l', 'u', 'e', 'R', '\031', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'G', 'a', 't', 'e', 'w', 'a', 'y', 'F', 'a', +'i', 'l', 'u', 'r', 'e', '\022', 'x', '\n', '%', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', 'e', 'c', +'u', 't', 'i', 'v', 'e', '_', 'g', 'a', 't', 'e', 'w', 'a', 'y', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\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', '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', '\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', '\022', 'R', '\n', '\030', 'm', -'a', 'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\026', +'3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\"', 'e', 'n', 'f', 'o', 'r', 'c', 'i', +'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'G', 'a', 't', 'e', 'w', 'a', 'y', 'F', 'a', 'i', 'l', 'u', +'r', 'e', '\022', 'J', '\n', '\"', 's', 'p', 'l', 'i', 't', '_', 'e', 'x', 't', 'e', 'r', 'n', 'a', 'l', '_', 'l', 'o', 'c', 'a', +'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'e', 'r', 'r', 'o', 'r', 's', '\030', '\014', ' ', '\001', '(', '\010', 'R', '\036', 's', 'p', +'l', 'i', 't', 'E', 'x', 't', 'e', 'r', 'n', 'a', 'l', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'E', 'r', 'r', +'o', 'r', 's', '\022', 'e', '\n', ' ', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'l', 'o', 'c', 'a', 'l', '_', +'o', 'r', 'i', 'g', 'i', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\r', ' ', '\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', '\035', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'F', +'a', 'i', 'l', 'u', 'r', 'e', '\022', '\201', '\001', '\n', '*', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'c', 'o', 'n', 's', +'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'f', 'a', 'i', 'l', +'u', 'r', 'e', '\030', '\016', ' ', '\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', 'd', 'R', '&', +'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'L', 'o', 'c', 'a', 'l', +'O', 'r', 'i', 'g', 'i', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', 's', '\n', '#', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', +'g', '_', 'l', 'o', 'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 's', 'u', 'c', 'c', 'e', 's', 's', '_', 'r', 'a', +'t', 'e', '\030', '\017', ' ', '\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', 'd', 'R', '\037', 'e', +'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', 'S', 'u', 'c', 'c', 'e', 's', +'s', 'R', 'a', 't', 'e', '\022', 'g', '\n', '\034', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', +'g', 'e', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\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', 'B', '\007', +'\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\032', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', +'e', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'g', '\n', '\034', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', '_', 'f', +'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\021', ' ', '\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', 'd', 'R', '\032', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'F', 'a', +'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\022', '\177', '\n', ')', 'e', 'n', 'f', 'o', 'r', 'c', +'i', 'n', 'g', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 'l', 'o', +'c', 'a', 'l', '_', 'o', 'r', 'i', 'g', 'i', 'n', '\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', 'B', '\007', '\372', 'B', +'\004', '*', '\002', '\030', 'd', 'R', '%', 'e', 'n', 'f', 'o', 'r', 'c', 'i', 'n', 'g', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', +'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'L', 'o', 'c', 'a', 'l', 'O', 'r', 'i', 'g', 'i', 'n', '\022', 'e', '\n', ' ', 'f', 'a', +'i', 'l', 'u', 'r', 'e', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', +'h', 'o', 's', 't', 's', '\030', '\023', ' ', '\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', '\035', 'f', 'a', 'i', 'l', 'u', 'r', 'e', +'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm', 'H', 'o', 's', 't', 's', '\022', 'g', '\n', +'!', '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', '\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', '\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', 'R', '\025', 'm', 'a', 'x', 'E', 'j', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', 'J', 'i', -'t', 't', 'e', 'r', '\022', 'w', '\n', '+', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', '_', 'a', 'c', 't', 'i', 'v', 'e', -'_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '_', 'u', 'n', 'e', 'j', 'e', 'c', 't', '_', 'h', 'o', 's', -'t', '\030', '\027', ' ', '\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', '&', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'A', 'c', 't', -'i', 'v', 'e', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'U', 'n', 'e', 'j', 'e', 'c', 't', 'H', 'o', 's', 't', -':', ',', '\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', '\222', '\001', '\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', 'Z', 'H', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', -'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', -'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', -'t', 'o', '3', +'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', '\022', 'R', '\n', '\030', 'm', 'a', 'x', '_', 'e', 'j', 'e', 'c', 't', 'i', 'o', 'n', '_', +'t', 'i', 'm', 'e', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\026', ' ', '\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', '\025', 'm', 'a', 'x', 'E', +'j', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', 'J', 'i', 't', 't', 'e', 'r', '\022', 'w', '\n', '+', 's', 'u', 'c', 'c', +'e', 's', 's', 'f', 'u', 'l', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', +'k', '_', 'u', 'n', 'e', 'j', 'e', 'c', 't', '_', 'h', 'o', 's', 't', '\030', '\027', ' ', '\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', '&', +'s', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'A', 'c', 't', 'i', 'v', 'e', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', +'c', 'k', 'U', 'n', 'e', 'j', 'e', 'c', 't', 'H', 'o', 's', 't', '\022', 'F', '\n', '\010', 'm', 'o', 'n', 'i', 't', 'o', 'r', 's', +'\030', '\030', ' ', '\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', '\010', 'm', 'o', 'n', 'i', 't', 'o', 'r', 's', '\022', 'M', '\n', '\025', 'a', 'l', 'w', 'a', 'y', 's', '_', 'e', 'j', 'e', 'c', +'t', '_', 'o', 'n', 'e', '_', 'h', 'o', 's', 't', '\030', '\031', ' ', '\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', 'a', 'l', 'w', 'a', +'y', 's', 'E', 'j', 'e', 'c', 't', 'O', 'n', 'e', 'H', 'o', 's', 't', ':', ',', '\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', '\222', '\001', '\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', 'Z', 'H', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', +'/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', +'3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static _upb_DefPool_Init *deps[6] = { +static _upb_DefPool_Init *deps[7] = { + &envoy_config_core_v3_extension_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, @@ -138,5 +147,5 @@ _upb_DefPool_Init envoy_config_cluster_v3_outlier_detection_proto_upbdefinit = { deps, &envoy_config_cluster_v3_outlier_detection_proto_upb_file_layout, "envoy/config/cluster/v3/outlier_detection.proto", - UPB_STRINGVIEW_INIT(descriptor, 2703) + UPB_STRINGVIEW_INIT(descriptor, 2892) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c index 3c9eaceba3..c493343e4c 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.c @@ -23,7 +23,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[5559] = {'\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[6697] = {'\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', @@ -98,154 +98,199 @@ static const char descriptor[5559] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/' 's', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '\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', '\"', '\261', '\003', '\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', +'\006', 'R', '\r', 'b', 'u', 'i', 'l', 'd', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\"', '\315', '\003', '\n', '\010', 'M', 'e', 't', 'a', +'d', 'a', 't', 'a', '\022', 'i', '\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', '\022', 'k', '\n', -'\025', 't', 'y', 'p', 'e', 'd', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\002', ' ', -'\003', '(', '\013', '2', '7', '.', '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', '.', 'T', 'y', 'p', 'e', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', -'a', 'd', 'a', 't', 'a', 'E', 'n', 't', 'r', 'y', 'R', '\023', 't', 'y', 'p', 'e', 'd', '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', '\032', '\\', -'\n', '\030', 'T', 'y', 'p', 'e', 'd', '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', '\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', ':', '!', '\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', +'a', 'E', 'n', 't', 'r', 'y', 'B', '\014', '\372', 'B', '\t', '\232', '\001', '\006', '\"', '\004', 'r', '\002', '\020', '\001', 'R', '\016', 'f', 'i', 'l', +'t', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'y', '\n', '\025', 't', 'y', 'p', 'e', 'd', '_', 'f', 'i', 'l', 't', +'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\002', ' ', '\003', '(', '\013', '2', '7', '.', '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', '.', +'T', 'y', 'p', 'e', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'E', 'n', 't', 'r', 'y', 'B', +'\014', '\372', 'B', '\t', '\232', '\001', '\006', '\"', '\004', 'r', '\002', '\020', '\001', 'R', '\023', 't', 'y', 'p', 'e', 'd', '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', '\032', '\\', '\n', '\030', 'T', 'y', 'p', 'e', 'd', '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', '\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', ':', '!', '\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', '\"', '\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', '\"', 'A', '\n', '\016', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', -'\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', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', -'\315', '\001', '\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', '7', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '!', '\372', 'B', '\014', 'r', '\n', '(', -'\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', '\362', '\230', '\376', '\217', '\005', '\014', '\022', '\n', 'v', 'a', 'l', 'u', 'e', '_', 't', 'y', -'p', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', ':', '\n', '\t', 'r', 'a', 'w', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', -'\001', '(', '\014', 'B', '\035', '\372', 'B', '\010', 'z', '\006', '\020', '\000', '\030', '\200', '\200', '\001', '\362', '\230', '\376', '\217', '\005', '\014', '\022', '\n', 'v', -'a', 'l', 'u', 'e', '_', 't', 'y', 'p', 'e', 'R', '\010', 'r', 'a', 'w', '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', '\"', '\331', '\003', '\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', '?', -'\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', -'\004', '\003', '3', '.', '0', 'R', '\006', 'a', 'p', 'p', 'e', 'n', 'd', '\022', 'i', '\n', '\r', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'a', -'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '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', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', -'\005', '\202', '\001', '\002', '\020', '\001', 'R', '\014', 'a', 'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'k', -'e', 'e', 'p', '_', 'e', 'm', 'p', 't', 'y', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\016', 'k', 'e', -'e', 'p', 'E', 'm', 'p', 't', 'y', 'V', 'a', 'l', 'u', 'e', '\"', '}', '\n', '\022', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'p', 'p', -'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'E', 'X', -'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', 'D', 'D', '\020', '\000', '\022', '\021', '\n', '\r', 'A', 'D', 'D', '_', 'I', 'F', '_', 'A', -'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\036', '\n', '\032', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', -'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', 'D', 'D', '\020', '\002', '\022', '\027', '\n', '\023', 'O', 'V', 'E', 'R', 'W', 'R', 'I', -'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '\020', '\003', ':', '*', '\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', '\"', '\364', '\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', '\022', '<', '\n', -'\024', 'e', 'n', 'v', 'i', 'r', 'o', 'n', 'm', 'e', 'n', 't', '_', 'v', 'a', 'r', 'i', 'a', 'b', 'l', 'e', '\030', '\004', ' ', '\001', -'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\023', 'e', 'n', 'v', 'i', 'r', 'o', 'n', 'm', 'e', 'n', -'t', 'V', 'a', 'r', 'i', 'a', 'b', 'l', 'e', ':', '#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'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', '\"', '?', '\n', '\010', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', '\022', '\035', '\n', +'\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\020', '\001', '(', '\200', '\200', '\001', 'R', '\003', +'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\014', 'R', '\005', 'v', 'a', 'l', 'u', 'e', +'\"', '\256', '\002', '\n', '\016', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', 'p', 'e', 'n', 'd', '\022', '>', '\n', '\005', 'e', 'n', +'t', 'r', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', +'\001', 'R', '\005', 'e', 'n', 't', 'r', 'y', '\022', '[', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', +'9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'K', 'e', +'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', 'p', 'e', 'n', 'd', '.', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', 'p', 'e', +'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'a', 'c', 't', 'i', 'o', +'n', '\"', '\177', '\n', '\024', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', +'\022', '\033', '\n', '\027', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', +'D', 'D', '\020', '\000', '\022', '\021', '\n', '\r', 'A', 'D', 'D', '_', 'I', 'F', '_', 'A', 'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\036', +'\n', '\032', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', +'A', 'D', 'D', '\020', '\002', '\022', '\027', '\n', '\023', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', +'S', 'T', 'S', '\020', '\003', '\"', 's', '\n', '\020', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'M', 'u', 't', 'a', 't', 'i', 'o', 'n', +'\022', '<', '\n', '\006', 'a', 'p', 'p', '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', '.', 'K', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'A', 'p', +'p', 'e', 'n', 'd', 'R', '\006', 'a', 'p', 'p', 'e', 'n', 'd', '\022', '!', '\n', '\006', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\002', ' ', +'\001', '(', '\t', 'B', '\t', '\372', 'B', '\006', 'r', '\004', '(', '\200', '\200', '\001', 'R', '\006', 'r', 'e', 'm', 'o', 'v', 'e', '\"', 'A', '\n', +'\016', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\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', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', +'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', '\315', '\001', '\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', '7', '\n', '\005', 'v', 'a', 'l', 'u', +'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '!', '\372', 'B', '\014', 'r', '\n', '(', '\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', '\362', +'\230', '\376', '\217', '\005', '\014', '\022', '\n', 'v', 'a', 'l', 'u', 'e', '_', 't', 'y', 'p', 'e', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', +':', '\n', '\t', 'r', 'a', 'w', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\014', 'B', '\035', '\372', 'B', '\010', 'z', '\006', +'\020', '\000', '\030', '\200', '\200', '\001', '\362', '\230', '\376', '\217', '\005', '\014', '\022', '\n', 'v', 'a', 'l', 'u', 'e', '_', 't', 'y', 'p', 'e', 'R', +'\010', 'r', 'a', 'w', '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', '\"', '\331', '\003', +'\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', '?', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\006', 'a', 'p', 'p', +'e', 'n', 'd', '\022', 'i', '\n', '\r', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', +'\016', '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', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'A', +'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\014', 'a', 'p', +'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', '(', '\n', '\020', 'k', 'e', 'e', 'p', '_', 'e', 'm', 'p', 't', 'y', '_', +'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\016', 'k', 'e', 'e', 'p', 'E', 'm', 'p', 't', 'y', 'V', 'a', 'l', +'u', 'e', '\"', '}', '\n', '\022', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'p', 'p', 'e', 'n', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', +'\033', '\n', '\027', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', 'D', +'D', '\020', '\000', '\022', '\021', '\n', '\r', 'A', 'D', 'D', '_', 'I', 'F', '_', 'A', 'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\036', '\n', +'\032', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', 'T', 'S', '_', 'O', 'R', '_', 'A', +'D', 'D', '\020', '\002', '\022', '\027', '\n', '\023', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '_', 'I', 'F', '_', 'E', 'X', 'I', 'S', +'T', 'S', '\020', '\003', ':', '*', '\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', '\"', '\311', '\002', '\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', '\022', '<', '\n', '\024', 'e', 'n', 'v', 'i', 'r', 'o', 'n', 'm', 'e', +'n', 't', '_', 'v', 'a', 'r', 'i', 'a', 'b', 'l', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', 'H', '\000', 'R', '\023', 'e', 'n', 'v', 'i', 'r', 'o', 'n', 'm', 'e', 'n', 't', 'V', 'a', 'r', 'i', 'a', 'b', 'l', 'e', '\022', +'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\005', ' ', '\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', ':', '#', '\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', +'s', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\356', '\005', '\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', -'}', '\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', -'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', -'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', -'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', -'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'r', 'i', 'e', 's', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', 'i', 'e', 's', '\022', '\031', '\n', '\010', 'r', 'e', 't', 'r', 'y', +'_', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 't', 'r', 'y', 'O', 'n', '\022', 'V', '\n', '\016', 'r', 'e', 't', +'r', 'y', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\004', ' ', '\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', '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', 'f', '\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', '4', '.', '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', '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', '\032', 'v', '\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', '\002', ' ', '\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', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', +'t', 'y', 'p', 'e', '\032', '{', '\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', '\002', ' ', '\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', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', +'t', 'y', 'p', 'e', ':', '$', '\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', '}', '\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', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', +'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', +'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', +'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[15] = { @@ -270,5 +315,5 @@ _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit = { deps, &envoy_config_core_v3_base_proto_upb_file_layout, "envoy/config/core/v3/base.proto", - UPB_STRINGVIEW_INIT(descriptor, 5559) + UPB_STRINGVIEW_INIT(descriptor, 6697) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h index eda8aed61c..d70869d290 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/base.upbdefs.h @@ -78,6 +78,21 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RuntimeFeatureFlag_getmsgd return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RuntimeFeatureFlag"); } +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_KeyValue_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.KeyValue"); +} + +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_KeyValueAppend_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.KeyValueAppend"); +} + +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_KeyValueMutation_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.KeyValueMutation"); +} + UPB_INLINE const upb_MessageDef *envoy_config_core_v3_QueryParameter_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.QueryParameter"); @@ -113,6 +128,16 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RetryPolicy_getmsgdef(upb_ return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RetryPolicy"); } +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RetryPolicy_RetryPriority_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RetryPolicy.RetryPriority"); +} + +UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RetryPolicy_RetryHostPredicate_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RetryPolicy.RetryHostPredicate"); +} + UPB_INLINE const upb_MessageDef *envoy_config_core_v3_RemoteDataSource_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_core_v3_base_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.core.v3.RemoteDataSource"); diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c index cf94304810..3fc9ea382e 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.c @@ -20,7 +20,7 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[3037] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', +static const char descriptor[3024] = {'\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', '\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', @@ -133,15 +133,14 @@ static const char descriptor[3037] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', ' ' ', '\001', '(', '\010', 'R', ' ', 'a', 'p', 'p', 'l', 'y', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'W', 'i', 't', 'h', 'o', 'u', 't', 'W', 'a', 'r', 'm', 'i', 'n', 'g', '\022', '%', '\n', '\t', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', 's', '\030', '\004', ' ', '\003', '(', '\t', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 't', 'y', 'p', 'e', 'U', 'r', -'l', 's', '*', '@', '\n', '\n', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\025', '\n', '\004', 'A', 'U', 'T', 'O', '\020', -'\000', '\032', '\013', '\010', '\001', '\212', '\364', '\233', '\263', '\005', '\003', '3', '.', '0', '\022', '\023', '\n', '\002', 'V', '2', '\020', '\001', '\032', '\013', '\010', -'\001', '\212', '\364', '\233', '\263', '\005', '\003', '3', '.', '0', '\022', '\006', '\n', '\002', 'V', '3', '\020', '\002', 'B', '\205', '\001', '\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', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', -'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', -'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', -'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'l', 's', '*', '3', '\n', '\n', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', +'\000', '\022', '\023', '\n', '\002', 'V', '2', '\020', '\001', '\032', '\013', '\010', '\001', '\212', '\364', '\233', '\263', '\005', '\003', '3', '.', '0', '\022', '\006', '\n', +'\002', 'V', '3', '\020', '\002', 'B', '\205', '\001', '\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', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', +'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', +'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', +'3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[12] = { @@ -163,5 +162,5 @@ _upb_DefPool_Init envoy_config_core_v3_config_source_proto_upbdefinit = { deps, &envoy_config_core_v3_config_source_proto_upb_file_layout, "envoy/config/core/v3/config_source.proto", - UPB_STRINGVIEW_INIT(descriptor, 3037) + UPB_STRINGVIEW_INIT(descriptor, 3024) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c index a6fd22a017..39e68bb6ba 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.c @@ -19,7 +19,7 @@ extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4823] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'g', 'r', +static const char descriptor[5030] = {'\n', '\'', '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', '\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', '\031', 'g', 'o', @@ -33,7 +33,7 @@ static const char descriptor[4823] = {'\n', '\'', 'e', 'n', 'v', 'o', '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', '\"', '\322', '!', '\n', +'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\241', '#', '\n', '\013', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'L', '\n', '\n', 'e', 'n', 'v', 'o', 'y', '_', 'g', 'r', 'p', 'c', '\030', '\001', ' ', '\001', '(', '\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', '.', 'E', 'n', 'v', 'o', 'y', 'G', 'r', @@ -46,172 +46,181 @@ static const char descriptor[4823] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'L', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\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', 'R', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'M', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\032', '\336', '\001', '\n', '\t', 'E', 'n', 'v', 'o', 'y', 'G', 'r', 'p', 'c', '\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', '/', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\002', -' ', '\001', '(', '\t', 'B', '\021', '\372', 'B', '\016', 'r', '\014', '\020', '\000', '(', '\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\t', -'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\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', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'E', 'n', 'v', 'o', 'y', 'G', 'r', -'p', 'c', '\032', '\372', '\034', '\n', '\n', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '\022', '&', '\n', '\n', 't', 'a', 'r', 'g', -'e', 't', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\t', 't', 'a', -'r', 'g', 'e', 't', 'U', 'r', 'i', '\022', 'p', '\n', '\023', 'c', 'h', 'a', 'n', 'n', 'e', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', -'t', 'i', 'a', 'l', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '?', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'t', 'a', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\006', ' ', '\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', '\032', '\347', '\002', +'\n', '\t', 'E', 'n', 'v', 'o', 'y', 'G', 'r', 'p', 'c', '\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', '/', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', +'\021', '\372', 'B', '\016', 'r', '\014', '\020', '\000', '(', '\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\t', 'a', 'u', 't', 'h', 'o', +'r', 'i', 't', 'y', '\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', '\022', +'Y', '\n', '\032', 'm', 'a', 'x', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'l', 'e', +'n', 'g', 't', 'h', '\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', '\027', 'm', 'a', 'x', 'R', 'e', 'c', 'e', 'i', +'v', 'e', 'M', 'e', 's', 's', 'a', 'g', 'e', 'L', 'e', 'n', 'g', 't', 'h', '\022', ',', '\n', '\022', 's', 'k', 'i', 'p', '_', 'e', +'n', 'v', 'o', 'y', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\020', 's', 'k', 'i', 'p', 'E', +'n', 'v', 'o', 'y', 'H', 'e', 'a', 'd', 'e', 'r', 's', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', +'E', 'n', 'v', 'o', 'y', 'G', 'r', 'p', 'c', '\032', '\372', '\034', '\n', '\n', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '\022', +'&', '\n', '\n', 't', 'a', 'r', 'g', 'e', 't', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', +'\002', '\020', '\001', 'R', '\t', 't', 'a', 'r', 'g', 'e', 't', 'U', 'r', 'i', '\022', 'p', '\n', '\023', 'c', 'h', 'a', 'n', 'n', 'e', 'l', +'_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\002', ' ', '\001', '(', '\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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', +'d', 'e', 'n', 't', 'i', 'a', 'l', 's', 'R', '\022', 'c', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', +'a', 'l', 's', '\022', 'g', '\n', '\020', 'c', 'a', 'l', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\003', +' ', '\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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', +'.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'R', '\017', 'c', 'a', 'l', 'l', 'C', 'r', 'e', +'d', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '(', '\n', '\013', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\004', +' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 's', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', +'\022', '8', '\n', '\030', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '_', 'f', 'a', 'c', 't', 'o', 'r', 'y', '_', 'n', +'a', 'm', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\026', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'a', 'c', +'t', 'o', 'r', 'y', 'N', 'a', 'm', 'e', '\022', '/', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\006', ' ', '\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', +'\006', 'c', 'o', 'n', 'f', 'i', 'g', '\022', '^', '\n', '\035', 'p', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'u', 'f', +'f', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '_', 'b', 'y', 't', 'e', 's', '\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', '\031', 'p', 'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'B', 'y', +'t', 'e', 's', '\022', '[', '\n', '\014', 'c', 'h', 'a', 'n', 'n', 'e', 'l', '_', 'a', 'r', 'g', 's', '\030', '\010', ' ', '\001', '(', '\013', +'2', '8', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', +'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', 'R', '\013', 'c', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '\032', '\235', '\002', '\n', +'\016', 'S', 's', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '?', '\n', '\n', 'r', 'o', 'o', 't', '_', 'c', +'e', 'r', 't', 's', '\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', 'r', 'o', 'o', 't', +'C', 'e', 'r', 't', 's', '\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', '?', '\n', '\n', 'c', 'e', 'r', 't', '_', 'c', 'h', 'a', 'i', 'n', '\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', 'c', 'e', 'r', 't', 'C', 'h', 'a', 'i', 'n', ':', '>', '\232', '\305', '\210', +'\036', '9', '\n', '7', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', +'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'S', 's', 'l', 'C', 'r', +'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\032', '`', '\n', '\026', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', +'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', ':', 'F', '\232', '\305', '\210', '\036', 'A', '\n', '?', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', +'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', +'e', 'n', 't', 'i', 'a', 'l', 's', '\032', '\222', '\003', '\n', '\022', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', +'t', 'i', 'a', 'l', 's', '\022', 'f', '\n', '\017', 's', 's', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', +'\001', ' ', '\001', '(', '\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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', +'c', '.', 'S', 's', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\016', 's', 's', 'l', 'C', 'r', +'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '?', '\n', '\016', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'd', 'e', 'f', 'a', 'u', +'l', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'E', 'm', 'p', 't', 'y', 'H', '\000', 'R', '\r', 'g', 'o', 'o', 'g', 'l', 'e', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', +'r', '\n', '\021', 'l', 'o', 'c', 'a', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\003', ' ', '\001', '(', +'\013', '2', 'C', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'G', 'o', +'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\020', 'l', +'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', ':', 'B', '\232', '\305', '\210', '\036', '=', '\n', ';', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', +'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', +'d', 'e', 'n', 't', 'i', 'a', 'l', 's', 'B', '\033', '\n', '\024', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', '_', 's', 'p', +'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\210', '\017', '\n', '\017', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', +'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '#', '\n', '\014', 'a', 'c', 'c', 'e', 's', 's', '_', 't', 'o', 'k', 'e', 'n', '\030', '\001', +' ', '\001', '(', '\t', 'H', '\000', 'R', '\013', 'a', 'c', 'c', 'e', 's', 's', 'T', 'o', 'k', 'e', 'n', '\022', 'L', '\n', '\025', 'g', 'o', +'o', 'g', 'l', 'e', '_', 'c', 'o', 'm', 'p', 'u', 't', 'e', '_', 'e', 'n', 'g', 'i', 'n', 'e', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', 'y', 'H', +'\000', 'R', '\023', 'g', 'o', 'o', 'g', 'l', 'e', 'C', 'o', 'm', 'p', 'u', 't', 'e', 'E', 'n', 'g', 'i', 'n', 'e', '\022', '2', '\n', +'\024', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 't', 'o', 'k', 'e', 'n', '\030', '\003', ' ', '\001', +'(', '\t', 'H', '\000', 'R', '\022', 'g', 'o', 'o', 'g', 'l', 'e', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'T', 'o', 'k', 'e', 'n', '\022', +'\236', '\001', '\n', '\032', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'a', 'c', 'c', 'o', 'u', 'n', 't', '_', 'j', 'w', 't', '_', 'a', +'c', 'c', 'e', 's', 's', '\030', '\004', ' ', '\001', '(', '\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', '.', 'G', 'o', 'o', -'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', -'s', 'R', '\022', 'c', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', 'g', '\n', '\020', -'c', 'a', 'l', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '<', '.', +'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', +'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', +'d', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\027', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', +'t', 'J', 'w', 't', 'A', 'c', 'c', 'e', 's', 's', '\022', 'r', '\n', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'i', 'a', 'm', '\030', +'\005', ' ', '\001', '(', '\013', '2', 'Q', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', +'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'I', +'A', 'M', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\t', 'g', 'o', 'o', 'g', 'l', 'e', 'I', 'a', +'m', '\022', '}', '\n', '\013', 'f', 'r', 'o', 'm', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '\006', ' ', '\001', '(', '\013', '2', 'Z', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', -'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'R', '\017', 'c', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', -'s', '\022', '(', '\n', '\013', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\007', '\372', -'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 's', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '8', '\n', '\030', 'c', 'r', 'e', -'d', 'e', 'n', 't', 'i', 'a', 'l', 's', '_', 'f', 'a', 'c', 't', 'o', 'r', 'y', '_', 'n', 'a', 'm', 'e', '\030', '\005', ' ', '\001', -'(', '\t', 'R', '\026', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'a', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', -'e', '\022', '/', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\006', ' ', '\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', '\006', 'c', 'o', 'n', 'f', 'i', 'g', -'\022', '^', '\n', '\035', 'p', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', -'i', 't', '_', 'b', 'y', 't', 'e', 's', '\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', '\031', 'p', 'e', 'r', 'S', -'t', 'r', 'e', 'a', 'm', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'B', 'y', 't', 'e', 's', '\022', '[', '\n', '\014', -'c', 'h', 'a', 'n', 'n', 'e', 'l', '_', 'a', 'r', 'g', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '8', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', -'s', 'R', '\013', 'c', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '\032', '\235', '\002', '\n', '\016', 'S', 's', 'l', 'C', 'r', 'e', -'d', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '?', '\n', '\n', 'r', 'o', 'o', 't', '_', 'c', 'e', 'r', 't', 's', '\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', 'r', 'o', 'o', 't', 'C', 'e', 'r', 't', 's', '\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', '?', -'\n', '\n', 'c', 'e', 'r', 't', '_', 'c', 'h', 'a', 'i', 'n', '\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', 'c', 'e', 'r', 't', 'C', 'h', 'a', 'i', 'n', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', -'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'S', 's', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', -'l', 's', '\032', '`', '\n', '\026', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', -'a', 'l', 's', ':', 'F', '\232', '\305', '\210', '\036', 'A', '\n', '?', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', -'p', 'c', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', -'\032', '\222', '\003', '\n', '\022', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', 'f', -'\n', '\017', 's', 's', 'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', ';', +'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'C', 'r', 'e', 'd', 'e', 'n', 't', +'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', 'H', '\000', 'R', '\n', 'f', 'r', 'o', 'm', 'P', 'l', 'u', +'g', 'i', 'n', '\022', 'j', '\n', '\013', 's', 't', 's', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', +'G', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', +'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'H', '\000', 'R', +'\n', 's', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\032', '\331', '\001', '\n', '\"', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', +'c', 'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', +'\022', '\031', '\n', '\010', 'j', 's', 'o', 'n', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'j', 's', 'o', 'n', 'K', +'e', 'y', '\022', '4', '\n', '\026', 't', 'o', 'k', 'e', 'n', '_', 'l', 'i', 'f', 'e', 't', 'i', 'm', 'e', '_', 's', 'e', 'c', 'o', +'n', 'd', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\024', 't', 'o', 'k', 'e', 'n', 'L', 'i', 'f', 'e', 't', 'i', 'm', 'e', 'S', +'e', 'c', 'o', 'n', 'd', 's', ':', 'b', '\232', '\305', '\210', '\036', ']', '\n', '[', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', +'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 'e', 'r', +'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', +'n', 't', 'i', 'a', 'l', 's', '\032', '\314', '\001', '\n', '\024', 'G', 'o', 'o', 'g', 'l', 'e', 'I', 'A', 'M', 'C', 'r', 'e', 'd', 'e', +'n', 't', 'i', 'a', 'l', 's', '\022', '/', '\n', '\023', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', '_', 't', +'o', 'k', 'e', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\022', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', +'T', 'o', 'k', 'e', 'n', '\022', '-', '\n', '\022', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '_', 's', 'e', 'l', 'e', 'c', 't', +'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\021', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', 'S', 'e', 'l', 'e', 'c', 't', +'o', 'r', ':', 'T', '\232', '\305', '\210', '\036', 'O', '\n', 'M', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', +'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', +'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'I', +'A', 'M', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\032', '\352', '\001', '\n', '\035', 'M', 'e', 't', 'a', 'd', 'a', 't', +'a', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', '\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', 'X', '\n', 'V', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', +'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', +'.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', +'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', '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', '\327', '\003', '\n', '\n', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', ';', '\n', '\032', 't', 'o', 'k', 'e', 'n', '_', +'e', 'x', 'c', 'h', 'a', 'n', 'g', 'e', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\027', 't', 'o', 'k', 'e', 'n', 'E', 'x', 'c', 'h', 'a', 'n', 'g', 'e', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'U', 'r', +'i', '\022', '\032', '\n', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'r', 'e', 's', 'o', +'u', 'r', 'c', 'e', '\022', '\032', '\n', '\010', 'a', 'u', 'd', 'i', 'e', 'n', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\010', 'a', +'u', 'd', 'i', 'e', 'n', 'c', 'e', '\022', '\024', '\n', '\005', 's', 'c', 'o', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\005', 's', +'c', 'o', 'p', 'e', '\022', '0', '\n', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', '_', 't', 'o', 'k', 'e', 'n', '_', 't', +'y', 'p', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', 'T', 'o', 'k', 'e', 'n', +'T', 'y', 'p', 'e', '\022', '5', '\n', '\022', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 't', 'o', 'k', 'e', 'n', '_', 'p', 'a', 't', +'h', '\030', '\006', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', +'T', 'o', 'k', 'e', 'n', 'P', 'a', 't', 'h', '\022', '5', '\n', '\022', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 't', 'o', 'k', 'e', +'n', '_', 't', 'y', 'p', 'e', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 's', 'u', +'b', 'j', 'e', 'c', 't', 'T', 'o', 'k', 'e', 'n', 'T', 'y', 'p', 'e', '\022', '(', '\n', '\020', 'a', 'c', 't', 'o', 'r', '_', 't', +'o', 'k', 'e', 'n', '_', 'p', 'a', 't', 'h', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'c', 't', 'o', 'r', 'T', 'o', 'k', +'e', 'n', 'P', 'a', 't', 'h', '\022', '(', '\n', '\020', 'a', 'c', 't', 'o', 'r', '_', 't', 'o', 'k', 'e', 'n', '_', 't', 'y', 'p', +'e', '\030', '\t', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'c', 't', 'o', 'r', 'T', 'o', 'k', 'e', 'n', 'T', 'y', 'p', 'e', ':', 'J', +'\232', '\305', '\210', '\036', 'E', '\n', 'C', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', +'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', +'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', +'?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', +'.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', +'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'B', '\033', '\n', '\024', 'c', 'r', 'e', 'd', 'e', 'n', 't', +'i', 'a', 'l', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\303', '\002', '\n', '\013', 'C', 'h', +'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '\022', 'V', '\n', '\004', 'a', 'r', 'g', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'B', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'S', 's', 'l', 'C', 'r', -'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\016', 's', 's', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', -'l', 's', '\022', '?', '\n', '\016', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', '\030', '\002', ' ', '\001', '(', -'\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', 'y', -'H', '\000', 'R', '\r', 'g', 'o', 'o', 'g', 'l', 'e', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', 'r', '\n', '\021', 'l', 'o', 'c', 'a', -'l', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', +'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', +'e', 'l', 'A', 'r', 'g', 's', '.', 'A', 'r', 'g', 's', 'E', 'n', 't', 'r', 'y', 'R', '\004', 'a', 'r', 'g', 's', '\032', 'c', '\n', +'\005', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', +'\001', '(', '\t', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\035', '\n', '\t', 'i', 'n', 't', +'_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\003', 'H', '\000', 'R', '\010', 'i', 'n', 't', 'V', 'a', 'l', 'u', 'e', 'B', +'\026', '\n', '\017', 'v', 'a', 'l', 'u', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', 'w', +'\n', '\t', 'A', 'r', 'g', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', +'\003', 'k', 'e', 'y', '\022', 'T', '\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', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', -'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'L', 'o', 'c', -'a', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\020', 'l', 'o', 'c', 'a', 'l', 'C', 'r', 'e', -'d', 'e', 'n', 't', 'i', 'a', 'l', 's', ':', 'B', '\232', '\305', '\210', '\036', '=', '\n', ';', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', -'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', -'s', 'B', '\033', '\n', '\024', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', -'\022', '\003', '\370', 'B', '\001', '\032', '\210', '\017', '\n', '\017', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', -'\022', '#', '\n', '\014', 'a', 'c', 'c', 'e', 's', 's', '_', 't', 'o', 'k', 'e', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', -'\013', 'a', 'c', 'c', 'e', 's', 's', 'T', 'o', 'k', 'e', 'n', '\022', 'L', '\n', '\025', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'c', 'o', -'m', 'p', 'u', 't', 'e', '_', 'e', 'n', 'g', 'i', 'n', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'm', 'p', 't', 'y', 'H', '\000', 'R', '\023', 'g', 'o', 'o', 'g', -'l', 'e', 'C', 'o', 'm', 'p', 'u', 't', 'e', 'E', 'n', 'g', 'i', 'n', 'e', '\022', '2', '\n', '\024', 'g', 'o', 'o', 'g', 'l', 'e', -'_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 't', 'o', 'k', 'e', 'n', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\022', 'g', -'o', 'o', 'g', 'l', 'e', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'T', 'o', 'k', 'e', 'n', '\022', '\236', '\001', '\n', '\032', 's', 'e', 'r', -'v', 'i', 'c', 'e', '_', 'a', 'c', 'c', 'o', 'u', 'n', 't', '_', 'j', 'w', 't', '_', 'a', 'c', 'c', 'e', 's', 's', '\030', '\004', -' ', '\001', '(', '\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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', -'.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'A', -'c', 'c', 'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', -'s', 'H', '\000', 'R', '\027', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'J', 'w', 't', 'A', 'c', 'c', -'e', 's', 's', '\022', 'r', '\n', '\n', 'g', 'o', 'o', 'g', 'l', 'e', '_', 'i', 'a', 'm', '\030', '\005', ' ', '\001', '(', '\013', '2', 'Q', -'.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', -'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'I', 'A', 'M', 'C', 'r', 'e', 'd', 'e', -'n', 't', 'i', 'a', 'l', 's', 'H', '\000', 'R', '\t', 'g', 'o', 'o', 'g', 'l', 'e', 'I', 'a', 'm', '\022', '}', '\n', '\013', 'f', 'r', -'o', 'm', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '\006', ' ', '\001', '(', '\013', '2', 'Z', '.', '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', -'.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', -'l', 's', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', 'F', 'r', 'o', -'m', 'P', 'l', 'u', 'g', 'i', 'n', 'H', '\000', 'R', '\n', 'f', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', '\022', 'j', '\n', '\013', -'s', 't', 's', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', 'G', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', -'i', 'a', 'l', 's', '.', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'H', '\000', 'R', '\n', 's', 't', 's', 'S', 'e', 'r', -'v', 'i', 'c', 'e', '\032', '\331', '\001', '\n', '\"', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'J', 'W', -'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', '\031', '\n', '\010', 'j', 's', 'o', -'n', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'j', 's', 'o', 'n', 'K', 'e', 'y', '\022', '4', '\n', '\026', 't', -'o', 'k', 'e', 'n', '_', 'l', 'i', 'f', 'e', 't', 'i', 'm', 'e', '_', 's', 'e', 'c', 'o', 'n', 'd', 's', '\030', '\002', ' ', '\001', -'(', '\004', 'R', '\024', 't', 'o', 'k', 'e', 'n', 'L', 'i', 'f', 'e', 't', 'i', 'm', 'e', 'S', 'e', 'c', 'o', 'n', 'd', 's', ':', -'b', '\232', '\305', '\210', '\036', ']', '\n', '[', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', -'.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', -'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'A', 'c', 'c', -'o', 'u', 'n', 't', 'J', 'W', 'T', 'A', 'c', 'c', 'e', 's', 's', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\032', -'\314', '\001', '\n', '\024', 'G', 'o', 'o', 'g', 'l', 'e', 'I', 'A', 'M', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\022', -'/', '\n', '\023', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', '_', 't', 'o', 'k', 'e', 'n', '\030', '\001', ' ', -'\001', '(', '\t', 'R', '\022', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', 'T', 'o', 'k', 'e', 'n', '\022', '-', -'\n', '\022', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '_', 's', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', -'\t', 'R', '\021', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', ':', 'T', '\232', '\305', '\210', -'\036', 'O', '\n', 'M', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', -'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', -'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'I', 'A', 'M', 'C', 'r', 'e', 'd', 'e', -'n', 't', 'i', 'a', 'l', 's', '\032', '\352', '\001', '\n', '\035', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'C', 'r', 'e', 'd', 'e', 'n', -'t', 'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', '\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', -'X', '\n', 'V', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', -'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', -'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'C', 'r', 'e', 'd', 'e', 'n', 't', -'i', 'a', 'l', 's', 'F', 'r', 'o', 'm', 'P', 'l', 'u', 'g', 'i', 'n', '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', '\327', '\003', '\n', '\n', 'S', 't', -'s', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', ';', '\n', '\032', 't', 'o', 'k', 'e', 'n', '_', 'e', 'x', 'c', 'h', 'a', 'n', 'g', -'e', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\027', 't', 'o', 'k', 'e', -'n', 'E', 'x', 'c', 'h', 'a', 'n', 'g', 'e', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'U', 'r', 'i', '\022', '\032', '\n', '\010', 'r', 'e', -'s', 'o', 'u', 'r', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '\032', '\n', -'\010', 'a', 'u', 'd', 'i', 'e', 'n', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\010', 'a', 'u', 'd', 'i', 'e', 'n', 'c', 'e', -'\022', '\024', '\n', '\005', 's', 'c', 'o', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\005', 's', 'c', 'o', 'p', 'e', '\022', '0', '\n', -'\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', '_', 't', 'o', 'k', 'e', 'n', '_', 't', 'y', 'p', 'e', '\030', '\005', ' ', '\001', -'(', '\t', 'R', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', 'T', 'o', 'k', 'e', 'n', 'T', 'y', 'p', 'e', '\022', '5', '\n', -'\022', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 't', 'o', 'k', 'e', 'n', '_', 'p', 'a', 't', 'h', '\030', '\006', ' ', '\001', '(', '\t', -'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', 'T', 'o', 'k', 'e', 'n', 'P', 'a', -'t', 'h', '\022', '5', '\n', '\022', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 't', 'o', 'k', 'e', 'n', '_', 't', 'y', 'p', 'e', '\030', -'\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', 'T', 'o', -'k', 'e', 'n', 'T', 'y', 'p', 'e', '\022', '(', '\n', '\020', 'a', 'c', 't', 'o', 'r', '_', 't', 'o', 'k', 'e', 'n', '_', 'p', 'a', -'t', 'h', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'c', 't', 'o', 'r', 'T', 'o', 'k', 'e', 'n', 'P', 'a', 't', 'h', '\022', -'(', '\n', '\020', 'a', 'c', 't', 'o', 'r', '_', 't', 'o', 'k', 'e', 'n', '_', 't', 'y', 'p', 'e', '\030', '\t', ' ', '\001', '(', '\t', -'R', '\016', 'a', 'c', 't', 'o', 'r', 'T', 'o', 'k', 'e', 'n', 'T', 'y', 'p', 'e', ':', 'J', '\232', '\305', '\210', '\036', 'E', '\n', 'C', -'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', -'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', 'e', -'n', 't', 'i', 'a', 'l', 's', '.', 'S', 't', 's', 'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', -'8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', -'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'a', 'l', 'l', 'C', 'r', 'e', 'd', -'e', 'n', 't', 'i', 'a', 'l', 's', 'B', '\033', '\n', '\024', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', '_', 's', 'p', 'e', -'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\303', '\002', '\n', '\013', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', -'g', 's', '\022', 'V', '\n', '\004', 'a', 'r', 'g', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'B', '.', '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', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '.', -'A', 'r', 'g', 's', 'E', 'n', 't', 'r', 'y', 'R', '\004', 'a', 'r', 'g', 's', '\032', 'c', '\n', '\005', 'V', 'a', 'l', 'u', 'e', '\022', -'#', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\013', -'s', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\035', '\n', '\t', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', -'\002', ' ', '\001', '(', '\003', 'H', '\000', 'R', '\010', 'i', 'n', 't', 'V', 'a', 'l', 'u', 'e', 'B', '\026', '\n', '\017', 'v', 'a', 'l', 'u', -'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', 'w', '\n', '\t', 'A', 'r', 'g', 's', 'E', -'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', 'T', '\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', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', -'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', 'g', 's', '.', 'V', 'a', 'l', 'u', -'e', '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', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', -'.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', -'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'B', -'\027', '\n', '\020', 't', 'a', 'r', 'g', 'e', 't', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', -'\004', '\010', '\004', '\020', '\005', 'B', '\204', '\001', '\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', 'G', 'r', 'p', 'c', -'S', 'e', 'r', 'v', 'i', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', -'m', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', -'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', -';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', '.', 'C', 'h', 'a', 'n', 'n', 'e', 'l', 'A', 'r', +'g', 's', '.', 'V', 'a', 'l', 'u', 'e', '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', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', +'S', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'G', 'o', 'o', 'g', 'l', 'e', 'G', 'r', 'p', 'c', ':', '$', '\232', '\305', '\210', '\036', '\037', +'\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'S', +'e', 'r', 'v', 'i', 'c', 'e', 'B', '\027', '\n', '\020', 't', 'a', 'r', 'g', 'e', 't', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', +'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\004', '\020', '\005', 'B', '\204', '\001', '\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', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', +'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', +'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', +'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', +'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[11] = { @@ -232,5 +241,5 @@ _upb_DefPool_Init envoy_config_core_v3_grpc_service_proto_upbdefinit = { deps, &envoy_config_core_v3_grpc_service_proto_upb_file_layout, "envoy/config/core/v3/grpc_service.proto", - UPB_STRINGVIEW_INIT(descriptor, 4823) + UPB_STRINGVIEW_INIT(descriptor, 5030) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c index 3550943637..2d6109ac00 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.c @@ -12,6 +12,7 @@ extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit; extern _upb_DefPool_Init envoy_config_core_v3_event_service_config_proto_upbdefinit; extern _upb_DefPool_Init envoy_config_core_v3_extension_proto_upbdefinit; +extern _upb_DefPool_Init envoy_config_core_v3_proxy_protocol_proto_upbdefinit; extern _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit; extern _upb_DefPool_Init envoy_type_v3_http_proto_upbdefinit; extern _upb_DefPool_Init envoy_type_v3_range_proto_upbdefinit; @@ -23,205 +24,214 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4812] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 'e', +static const char descriptor[5014] = {'\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', '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', '/', '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', '\030', 'e', 'n', 'v', 'o', -'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'h', 't', 't', 'p', '.', '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', '\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', '\017', -'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', 't', 'u', 's', 'S', 'e', 't', '\022', 'M', '\n', '\010', 's', 't', 'a', 't', 'u', 's', -'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', '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', '\"', '\355', '\036', '\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', '\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', '.', +'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', '/', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '.', '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', '\030', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', +'v', '3', '/', 'h', 't', 't', 'p', '.', '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', '\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', '\017', 'H', 'e', 'a', 'l', 't', 'h', 'S', +'t', 'a', 't', 'u', 's', 'S', 'e', 't', '\022', 'M', '\n', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\001', ' ', '\003', '(', +'\016', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'H', 'e', 'a', 'l', 't', 'h', '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', '\"', '\214', ' ', '\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', '\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', '\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', '1', '\n', '\016', 'e', 'v', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\021', ' ', '\001', '(', '\t', -'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', 'a', -'t', 'h', '\022', 'M', '\n', '\014', 'e', 'v', 'e', 'n', 't', '_', 'l', 'o', 'g', 'g', 'e', 'r', '\030', '\031', ' ', '\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', '\013', 'e', 'v', 'e', 'n', 't', -'L', 'o', 'g', 'g', 'e', 'r', '\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', '\314', '\007', '\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', ' ', '\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', '\022', 'W', '\n', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'b', 'u', 'f', 'f', -'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\016', ' ', '\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', '\022', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'u', 'f', 'f', 'e', 'r', 'S', 'i', 'z', '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', 'H', '\n', '\022', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\014', -' ', '\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', '\021', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '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', '\022', -'G', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\r', ' ', '\001', '(', '\016', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', -'o', 'd', 'B', '\n', '\372', 'B', '\007', '\202', '\001', '\004', '\020', '\001', ' ', '\006', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', ':', '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', +'\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', '1', '\n', '\016', 'e', 'v', +'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\021', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', +'\330', '\004', '\003', '3', '.', '0', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', 'a', 't', 'h', '\022', 'M', '\n', '\014', 'e', +'v', 'e', 'n', 't', '_', 'l', 'o', 'g', 'g', 'e', 'r', '\030', '\031', ' ', '\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', '\013', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'g', 'e', 'r', '\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', 'D', '\n', '\037', 'a', 'l', 'w', 'a', 'y', 's', '_', 'l', 'o', 'g', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', +'c', 'k', '_', 's', 'u', 'c', 'c', 'e', 's', 's', '\030', '\032', ' ', '\001', '(', '\010', 'R', '\033', 'a', 'l', 'w', 'a', 'y', 's', 'L', +'o', 'g', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'S', 'u', 'c', 'c', 'e', 's', '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', '.', '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', '\364', '\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', '\022', ']', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'm', 'e', 't', 'a', 'd', -'a', 't', 'a', '\030', '\003', ' ', '\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', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'M', 'e', 't', 'a', 'd', -'a', 't', 'a', ':', '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', '\204', '\001', '\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', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', -'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', -'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', '\321', -'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'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', '\306', '\007', '\n', '\017', 'H', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\034', '\n', '\004', +'h', 'o', 's', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\010', '\372', 'B', '\005', 'r', '\003', '\300', '\001', '\002', 'R', '\004', 'h', 'o', 's', +'t', '\022', '\036', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\n', '\372', 'B', '\007', 'r', '\005', '\020', '\001', '\300', +'\001', '\002', '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', ' ', '\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', '\022', 'W', '\n', '\024', 'r', 'e', 's', 'p', 'o', 'n', +'s', 'e', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\016', ' ', '\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', '\022', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'u', 'f', 'f', 'e', 'r', +'S', 'i', 'z', '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', 'H', '\n', '\022', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 's', 't', 'a', +'t', 'u', 's', 'e', 's', '\030', '\014', ' ', '\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', '\021', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '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', '\022', 'G', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\r', ' ', '\001', '(', '\016', '2', '#', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 'q', 'u', +'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', 'B', '\n', '\372', 'B', '\007', '\202', '\001', '\004', '\020', '\001', ' ', '\006', 'R', '\006', 'm', 'e', +'t', 'h', 'o', 'd', ':', '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', '\250', '\002', '\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', '\022', ']', '\n', '\025', +'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', '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', +'.', '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', '.', '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', '\364', '\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', '\022', ']', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'm', 'e', 't', +'a', 'd', 'a', 't', 'a', '\030', '\003', ' ', '\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', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'M', 'e', 't', +'a', 'd', 'a', 't', 'a', ':', '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', '\204', '\001', '\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', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', +'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', +'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', +'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static _upb_DefPool_Init *deps[15] = { +static _upb_DefPool_Init *deps[16] = { &envoy_config_core_v3_base_proto_upbdefinit, &envoy_config_core_v3_event_service_config_proto_upbdefinit, &envoy_config_core_v3_extension_proto_upbdefinit, + &envoy_config_core_v3_proxy_protocol_proto_upbdefinit, &envoy_type_matcher_v3_string_proto_upbdefinit, &envoy_type_v3_http_proto_upbdefinit, &envoy_type_v3_range_proto_upbdefinit, @@ -240,5 +250,5 @@ _upb_DefPool_Init envoy_config_core_v3_health_check_proto_upbdefinit = { deps, &envoy_config_core_v3_health_check_proto_upb_file_layout, "envoy/config/core/v3/health_check.proto", - UPB_STRINGVIEW_INIT(descriptor, 4812) + UPB_STRINGVIEW_INIT(descriptor, 5014) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c index 713bf4cff2..46aa7784fa 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.c @@ -18,7 +18,7 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[6815] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', +static const char descriptor[6988] = {'\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', '$', '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', '\033', 'e', @@ -42,7 +42,7 @@ static const char descriptor[6815] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', ' 'n', 'i', 't', 'i', 'a', 'l', '_', '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', '\"', '\000', '2', '\002', '\010', '\001', 'R', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'I', 'n', 't', 'e', -'r', 'v', 'a', 'l', '\"', '\223', '\005', '\n', '\023', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', +'r', 'v', 'a', 'l', '\"', '\361', '\005', '\n', '\023', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '[', '\n', '\026', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', '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', @@ -68,229 +68,236 @@ static const char descriptor[6815] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', ' 'p', 't', 'i', 'o', 'n', 's', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\021', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', ':', '\n', '\031', 'c', 'l', 'i', 'e', 'n', 't', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\027', 'c', 'l', 'i', 'e', 'n', 't', 'C', -'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\344', '\001', '\n', '\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', '\031', -'\n', '\010', 'a', 'u', 't', 'o', '_', 's', 'n', 'i', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\007', 'a', 'u', 't', 'o', 'S', 'n', 'i', -'\022', '.', '\n', '\023', 'a', 'u', 't', 'o', '_', 's', 'a', 'n', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\002', -' ', '\001', '(', '\010', 'R', '\021', 'a', 'u', 't', 'o', 'S', 'a', 'n', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', 'D', -'\n', '\030', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 'a', 'u', 't', 'o', '_', 's', 'n', 'i', '_', 'h', 'e', 'a', 'd', 'e', -'r', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\320', '\001', '\001', 'R', '\025', 'o', 'v', 'e', -'r', 'r', 'i', 'd', 'e', 'A', 'u', 't', 'o', 'S', 'n', 'i', 'H', 'e', 'a', 'd', 'e', 'r', ':', '4', '\232', '\305', '\210', '\036', '/', -'\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', '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', '\"', '\206', '\004', -'\n', '\036', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', -'O', 'p', 't', 'i', 'o', 'n', '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', 'F', '\n', '\013', 'm', 'a', 'x', '_', 'e', 'n', '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', '\007', '\372', 'B', '\004', '*', '\002', ' ', '\000', 'R', '\n', 'm', 'a', -'x', 'E', 'n', 't', 'r', 'i', 'e', 's', '\022', '_', '\n', '\026', 'k', 'e', 'y', '_', 'v', 'a', 'l', 'u', 'e', '_', 's', 't', 'o', -'r', 'e', '_', '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', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', -'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\023', 'k', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'S', 't', 'o', 'r', 'e', 'C', -'o', 'n', 'f', 'i', 'g', '\022', '\204', '\001', '\n', '\024', 'p', 'r', 'e', 'p', 'o', 'p', 'u', 'l', 'a', 't', 'e', 'd', '_', 'e', 'n', -'t', 'r', 'i', 'e', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', 'Q', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', -'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', -'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'E', 'n', 't', 'r', 'y', 'R', '\023', 'p', 'r', 'e', 'p', -'o', 'p', 'u', 'l', 'a', 't', 'e', 'd', 'E', 'n', 't', 'r', 'i', 'e', 's', '\022', '-', '\n', '\022', 'c', 'a', 'n', 'o', 'n', 'i', -'c', 'a', 'l', '_', 's', 'u', 'f', 'f', 'i', 'x', 'e', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\021', 'c', 'a', 'n', 'o', 'n', -'i', 'c', 'a', 'l', 'S', 'u', 'f', 'f', 'i', 'x', 'e', 's', '\032', 'h', '\n', '\034', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', -'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'E', 'n', 't', 'r', 'y', '\022', '\'', '\n', '\010', 'h', 'o', -'s', 't', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\320', '\001', '\001', -'R', '\010', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', '\037', '\n', '\004', 'p', 'o', 'r', 't', '\030', '\002', ' ', '\001', '(', '\r', 'B', -'\013', '\372', 'B', '\010', '*', '\006', '\020', '\377', '\377', '\003', ' ', '\000', 'R', '\004', 'p', 'o', 'r', 't', '\"', '\257', '\005', '\n', '\023', 'H', 't', -'t', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '<', '\n', '\014', 'i', 'd', 'l', 'e', -'_', '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', 'i', 'd', 'l', 'e', 'T', 'i', 'm', -'e', 'o', 'u', 't', '\022', 'Q', '\n', '\027', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'd', 'u', -'r', 'a', 't', 'i', 'o', 'n', '\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', '\025', 'm', 'a', 'x', 'C', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', 'Q', '\n', '\021', 'm', 'a', 'x', '_', 'h', 'e', 'a', 'd', 'e', -'r', 's', '_', 'c', 'o', 'u', 'n', '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', 'B', '\007', '\372', 'B', '\004', '*', -'\002', '(', '\001', 'R', '\017', 'm', 'a', 'x', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'C', 'o', 'u', 'n', 't', '\022', 'I', '\n', '\023', 'm', -'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\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', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\215', '\001', '\n', '\037', -'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'w', 'i', 't', 'h', '_', 'u', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', 'e', 's', '_', -'a', 'c', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', 'F', '.', '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', '.', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', 'e', 'r', 's', 'c', 'o', -'r', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\034', 'h', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', -'e', 'r', 's', 'c', 'o', 'r', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\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', '\006', ' ', '\001', '(', +'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\\', '\n', '\024', 'i', 'd', 'l', 'e', '_', +'n', 'e', 't', 'w', 'o', 'r', 'k', '_', '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', 'B', '\017', +'\372', 'B', '\014', '\252', '\001', '\t', '\"', '\003', '\010', '\330', '\004', '2', '\002', '\010', '\001', 'R', '\022', 'i', 'd', 'l', 'e', 'N', 'e', 't', 'w', +'o', 'r', 'k', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\"', '\344', '\001', '\n', '\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', '\031', '\n', '\010', 'a', 'u', 't', 'o', +'_', 's', 'n', 'i', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\007', 'a', 'u', 't', 'o', 'S', 'n', 'i', '\022', '.', '\n', '\023', 'a', 'u', +'t', 'o', '_', 's', 'a', 'n', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\021', +'a', 'u', 't', 'o', 'S', 'a', 'n', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', 'D', '\n', '\030', 'o', 'v', 'e', 'r', +'r', 'i', 'd', 'e', '_', 'a', 'u', 't', 'o', '_', 's', 'n', 'i', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\003', ' ', '\001', '(', +'\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\320', '\001', '\001', 'R', '\025', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'A', +'u', 't', 'o', 'S', 'n', 'i', 'H', 'e', 'a', 'd', 'e', 'r', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', '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', '\"', '\206', '\004', '\n', '\036', 'A', 'l', 't', 'e', +'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'O', 'p', 't', 'i', 'o', 'n', +'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', 'F', '\n', '\013', 'm', 'a', 'x', '_', 'e', 'n', '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', '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', '\"', 'N', '\n', '\034', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', -'e', 'r', 's', 'c', 'o', 'r', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020', '\000', -'\022', '\022', '\n', '\016', 'R', 'E', 'J', 'E', 'C', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', '\001', '\022', '\017', '\n', '\013', 'D', -'R', 'O', 'P', '_', 'H', 'E', 'A', 'D', 'E', 'R', '\020', '\002', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', -'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\223', '\t', '\n', '\024', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', -'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'H', '\n', '\022', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'b', 's', 'o', 'l', 'u', 't', -'e', '_', 'u', 'r', 'l', '\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', '\020', 'a', 'l', 'l', 'o', 'w', 'A', 'b', 's', 'o', -'l', 'u', 't', 'e', 'U', 'r', 'l', '\022', '$', '\n', '\016', 'a', 'c', 'c', 'e', 'p', 't', '_', 'h', 't', 't', 'p', '_', '1', '0', -'\030', '\002', ' ', '\001', '(', '\010', 'R', '\014', 'a', 'c', 'c', 'e', 'p', 't', 'H', 't', 't', 'p', '1', '0', '\022', '6', '\n', '\030', 'd', -'e', 'f', 'a', 'u', 'l', 't', '_', 'h', 'o', 's', 't', '_', 'f', 'o', 'r', '_', 'h', 't', 't', 'p', '_', '1', '0', '\030', '\003', -' ', '\001', '(', '\t', 'R', '\024', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'H', 'o', 's', 't', 'F', 'o', 'r', 'H', 't', 't', 'p', '1', -'0', '\022', 'f', '\n', '\021', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'k', 'e', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\004', ' ', -'\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', '.', 'H', 'e', -'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', 'R', '\017', 'h', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', -'o', 'r', 'm', 'a', 't', '\022', '\'', '\n', '\017', 'e', 'n', 'a', 'b', 'l', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', -'\005', ' ', '\001', '(', '\010', 'R', '\016', 'e', 'n', 'a', 'b', 'l', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '0', '\n', '\024', -'a', 'l', 'l', 'o', 'w', '_', 'c', 'h', 'u', 'n', 'k', 'e', 'd', '_', 'l', 'e', 'n', 'g', 't', 'h', '\030', '\006', ' ', '\001', '(', -'\010', 'R', '\022', 'a', 'l', 'l', 'o', 'w', 'C', 'h', 'u', 'n', 'k', 'e', 'd', 'L', 'e', 'n', 'g', 't', 'h', '\022', 'z', '\n', '-', -'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', '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', '\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', '\'', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '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', '\022', '7', '\n', '\030', 's', -'e', 'n', 'd', '_', 'f', 'u', 'l', 'l', 'y', '_', 'q', 'u', 'a', 'l', 'i', 'f', 'i', 'e', 'd', '_', 'u', 'r', 'l', '\030', '\010', -' ', '\001', '(', '\010', 'R', '\025', 's', 'e', 'n', 'd', 'F', 'u', 'l', 'l', 'y', 'Q', 'u', 'a', 'l', 'i', 'f', 'i', 'e', 'd', 'U', -'r', 'l', '\022', 'N', '\n', '\020', 'u', 's', 'e', '_', 'b', 'a', 'l', 's', 'a', '_', 'p', 'a', 'r', 's', 'e', 'r', '\030', '\t', ' ', -'\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', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\016', 'u', 's', 'e', 'B', 'a', 'l', 's', -'a', 'P', 'a', 'r', 's', 'e', 'r', '\022', ':', '\n', '\024', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'u', 's', 't', 'o', 'm', '_', 'm', -'e', 't', 'h', 'o', 'd', 's', '\030', '\n', ' ', '\001', '(', '\010', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\022', 'a', -'l', 'l', 'o', 'w', 'C', 'u', 's', 't', 'o', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', '\032', '\237', '\003', '\n', '\017', 'H', 'e', 'a', -'d', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'x', '\n', '\021', 'p', 'r', 'o', 'p', 'e', 'r', '_', 'c', 'a', -'s', 'e', '_', 'w', 'o', 'r', 'd', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', 'J', '.', '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', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '.', -'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', 'H', '\000', 'R', '\017', 'p', 'r', 'o', 'p', 'e', 'r', -'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', '\022', '[', '\n', '\022', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 'f', 'o', 'r', -'m', 'a', 't', 't', 'e', 'r', '\030', '\010', ' ', '\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', '\021', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', 'F', 'o', 'r', 'm', 'a', 't', 't', -'e', 'r', '\032', '`', '\n', '\017', 'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', ':', 'M', '\232', '\305', -'\210', '\036', 'H', '\n', 'F', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', -'t', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', -'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '.', 'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', -':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', -'e', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', -'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\024', '\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'f', -'o', 'r', 'm', 'a', 't', '\022', '\003', '\370', 'B', '\001', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', -'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\301', '\002', '\n', '\021', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'S', 'e', 't', 't', -'i', 'n', 'g', 's', '\022', 'C', '\n', '\010', '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', -'\014', '\372', 'B', '\t', '\252', '\001', '\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'C', -'\n', '\007', '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', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', -'\010', '\001', '2', '\004', '\020', '\300', '\204', '=', 'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', '?', '\n', '\017', 'i', 'n', 't', 'e', -'r', 'v', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '\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', 'i', 'n', 't', 'e', 'r', 'v', 'a', -'l', 'J', 'i', 't', 't', 'e', 'r', '\022', 'a', '\n', '\030', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'i', 'd', 'l', -'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', ' ', '\000', 'R', '\n', 'm', 'a', 'x', 'E', 'n', 't', 'r', 'i', +'e', 's', '\022', '_', '\n', '\026', 'k', 'e', 'y', '_', 'v', 'a', 'l', 'u', 'e', '_', 's', 't', 'o', 'r', 'e', '_', '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', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', +'f', 'i', 'g', 'R', '\023', 'k', 'e', 'y', 'V', 'a', 'l', 'u', 'e', 'S', 't', 'o', 'r', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', +'\204', '\001', '\n', '\024', 'p', 'r', 'e', 'p', 'o', 'p', 'u', 'l', 'a', 't', 'e', 'd', '_', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', +'\004', ' ', '\003', '(', '\013', '2', 'Q', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', 'C', 'a', 'c', +'h', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', +'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'E', 'n', 't', 'r', 'y', 'R', '\023', 'p', 'r', 'e', 'p', 'o', 'p', 'u', 'l', 'a', 't', +'e', 'd', 'E', 'n', 't', 'r', 'i', 'e', 's', '\022', '-', '\n', '\022', 'c', 'a', 'n', 'o', 'n', 'i', 'c', 'a', 'l', '_', 's', 'u', +'f', 'f', 'i', 'x', 'e', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\021', 'c', 'a', 'n', 'o', 'n', 'i', 'c', 'a', 'l', 'S', 'u', +'f', 'f', 'i', 'x', 'e', 's', '\032', 'h', '\n', '\034', 'A', 'l', 't', 'e', 'r', 'n', 'a', 't', 'e', 'P', 'r', 'o', 't', 'o', 'c', +'o', 'l', 's', 'C', 'a', 'c', 'h', 'e', 'E', 'n', 't', 'r', 'y', '\022', '\'', '\n', '\010', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', +'\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\320', '\001', '\001', 'R', '\010', 'h', 'o', 's', 't', +'n', 'a', 'm', 'e', '\022', '\037', '\n', '\004', 'p', 'o', 'r', 't', '\030', '\002', ' ', '\001', '(', '\r', 'B', '\013', '\372', 'B', '\010', '*', '\006', +'\020', '\377', '\377', '\003', ' ', '\000', 'R', '\004', 'p', 'o', 'r', 't', '\"', '\257', '\005', '\n', '\023', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', +'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '<', '\n', '\014', 'i', 'd', 'l', 'e', '_', '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', 'i', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'Q', +'\n', '\027', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'\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', '\025', 'm', 'a', 'x', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', '\022', 'Q', '\n', '\021', 'm', 'a', 'x', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'c', 'o', 'u', +'n', '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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\017', 'm', +'a', 'x', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'C', 'o', 'u', 'n', 't', '\022', 'I', '\n', '\023', 'm', 'a', 'x', '_', 's', 't', 'r', +'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\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', 'm', 'a', 'x', +'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\215', '\001', '\n', '\037', 'h', 'e', 'a', 'd', 'e', 'r', +'s', '_', 'w', 'i', 't', 'h', '_', 'u', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', 'e', 's', '_', 'a', 'c', 't', 'i', 'o', 'n', +'\030', '\005', ' ', '\001', '(', '\016', '2', 'F', '.', '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', '.', +'H', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', 'e', 's', 'A', 'c', 't', +'i', 'o', 'n', 'R', '\034', 'h', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', +'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\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', '\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', '\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', '\"', 'N', '\n', '\034', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'W', 'i', 't', 'h', 'U', 'n', 'd', 'e', 'r', 's', 'c', 'o', 'r', +'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020', '\000', '\022', '\022', '\n', '\016', 'R', 'E', +'J', 'E', 'C', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', '\001', '\022', '\017', '\n', '\013', 'D', 'R', 'O', 'P', '_', 'H', 'E', +'A', 'D', 'E', 'R', '\020', '\002', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', +'n', 's', '\"', '\223', '\t', '\n', '\024', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', +'n', 's', '\022', 'H', '\n', '\022', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'b', 's', 'o', 'l', 'u', 't', 'e', '_', 'u', 'r', 'l', '\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', '\020', 'a', 'l', 'l', 'o', 'w', 'A', 'b', 's', 'o', 'l', 'u', 't', 'e', 'U', 'r', +'l', '\022', '$', '\n', '\016', 'a', 'c', 'c', 'e', 'p', 't', '_', 'h', 't', 't', 'p', '_', '1', '0', '\030', '\002', ' ', '\001', '(', '\010', +'R', '\014', 'a', 'c', 'c', 'e', 'p', 't', 'H', 't', 't', 'p', '1', '0', '\022', '6', '\n', '\030', 'd', 'e', 'f', 'a', 'u', 'l', 't', +'_', 'h', 'o', 's', 't', '_', 'f', 'o', 'r', '_', 'h', 't', 't', 'p', '_', '1', '0', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\024', +'d', 'e', 'f', 'a', 'u', 'l', 't', 'H', 'o', 's', 't', 'F', 'o', 'r', 'H', 't', 't', 'p', '1', '0', '\022', 'f', '\n', '\021', 'h', +'e', 'a', 'd', 'e', 'r', '_', 'k', 'e', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\004', ' ', '\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', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', +'y', 'F', 'o', 'r', 'm', 'a', 't', 'R', '\017', 'h', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '\022', +'\'', '\n', '\017', 'e', 'n', 'a', 'b', 'l', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', '\005', ' ', '\001', '(', '\010', 'R', +'\016', 'e', 'n', 'a', 'b', 'l', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '0', '\n', '\024', 'a', 'l', 'l', 'o', 'w', '_', +'c', 'h', 'u', 'n', 'k', 'e', 'd', '_', 'l', 'e', 'n', 'g', 't', 'h', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\022', 'a', 'l', 'l', +'o', 'w', 'C', 'h', 'u', 'n', 'k', 'e', 'd', 'L', 'e', 'n', 'g', 't', 'h', '\022', 'z', '\n', '-', 'o', 'v', 'e', 'r', 'r', 'i', +'d', 'e', '_', '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', '\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', '\'', +'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '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', '\022', '7', '\n', '\030', 's', 'e', 'n', 'd', '_', 'f', 'u', +'l', 'l', 'y', '_', 'q', 'u', 'a', 'l', 'i', 'f', 'i', 'e', 'd', '_', 'u', 'r', 'l', '\030', '\010', ' ', '\001', '(', '\010', 'R', '\025', +'s', 'e', 'n', 'd', 'F', 'u', 'l', 'l', 'y', 'Q', 'u', 'a', 'l', 'i', 'f', 'i', 'e', 'd', 'U', 'r', 'l', '\022', 'N', '\n', '\020', +'u', 's', 'e', '_', 'b', 'a', 'l', 's', 'a', '_', 'p', 'a', 'r', 's', 'e', 'r', '\030', '\t', ' ', '\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', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\016', 'u', 's', 'e', 'B', 'a', 'l', 's', 'a', 'P', 'a', 'r', 's', 'e', +'r', '\022', ':', '\n', '\024', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'u', 's', 't', 'o', 'm', '_', 'm', 'e', 't', 'h', 'o', 'd', 's', +'\030', '\n', ' ', '\001', '(', '\010', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\022', 'a', 'l', 'l', 'o', 'w', 'C', 'u', +'s', 't', 'o', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', '\032', '\237', '\003', '\n', '\017', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', +'F', 'o', 'r', 'm', 'a', 't', '\022', 'x', '\n', '\021', 'p', 'r', 'o', 'p', 'e', 'r', '_', 'c', 'a', 's', 'e', '_', 'w', 'o', 'r', +'d', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', 'J', '.', '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', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', 'm', 'a', 't', '.', 'P', 'r', 'o', 'p', 'e', 'r', +'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', 'H', '\000', 'R', '\017', 'p', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', +'r', 'd', 's', '\022', '[', '\n', '\022', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', '_', 'f', 'o', 'r', 'm', 'a', 't', 't', 'e', 'r', +'\030', '\010', ' ', '\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', '\021', 's', 't', 'a', 't', 'e', 'f', 'u', 'l', 'F', 'o', 'r', 'm', 'a', 't', 't', 'e', 'r', '\032', '`', '\n', '\017', +'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', ':', 'M', '\232', '\305', '\210', '\036', 'H', '\n', 'F', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', +'t', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', 'y', 'F', 'o', 'r', +'m', 'a', 't', '.', 'P', 'r', 'o', 'p', 'e', 'r', 'C', 'a', 's', 'e', 'W', 'o', 'r', 'd', 's', ':', '=', '\232', '\305', '\210', '\036', +'8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', +'1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'K', 'e', +'y', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\024', '\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'f', 'o', 'r', 'm', 'a', 't', '\022', +'\003', '\370', 'B', '\001', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', +'.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', +'s', '\"', '\301', '\002', '\n', '\021', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', '\022', 'C', +'\n', '\010', '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', '\014', '\372', 'B', '\t', '\252', '\001', -'\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\026', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'I', 'd', 'l', 'e', 'I', 'n', -'t', 'e', 'r', 'v', 'a', 'l', '\"', '\320', '\016', '\n', '\024', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', '\022', 'F', '\n', '\020', 'h', 'p', 'a', 'c', 'k', '_', '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', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'h', 'p', 'a', 'c', 'k', 'T', 'a', 'b', 'l', 'e', 'S', -'i', 'z', 'e', '\022', 'a', '\n', '\026', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', '_', 's', 't', 'r', -'e', 'a', 'm', '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', '\r', '\372', 'B', '\n', '*', '\010', '\030', '\377', '\377', -'\377', '\377', '\007', '(', '\001', 'R', '\024', 'm', 'a', 'x', 'C', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', -'m', 's', '\022', 'j', '\n', '\032', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'n', 'd', -'o', 'w', '_', 's', 'i', 'z', 'e', '\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', '\017', '\372', 'B', '\014', '*', '\n', -'\030', '\377', '\377', '\377', '\377', '\007', '(', '\377', '\377', '\003', 'R', '\027', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'S', 't', 'r', 'e', 'a', 'm', -'W', 'i', 'n', 'd', 'o', 'w', 'S', 'i', 'z', 'e', '\022', 'r', '\n', '\036', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'c', 'o', 'n', -'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'w', 'i', 'n', 'd', 'o', 'w', '_', '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', '3', '2', -'V', 'a', 'l', 'u', 'e', 'B', '\017', '\372', 'B', '\014', '*', '\n', '\030', '\377', '\377', '\377', '\377', '\007', '(', '\377', '\377', '\003', 'R', '\033', 'i', -'n', 'i', 't', 'i', 'a', 'l', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'W', 'i', 'n', 'd', 'o', 'w', 'S', 'i', 'z', -'e', '\022', '#', '\n', '\r', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', -'\014', 'a', 'l', 'l', 'o', 'w', 'C', 'o', 'n', 'n', 'e', 'c', 't', '\022', '%', '\n', '\016', 'a', 'l', 'l', 'o', 'w', '_', 'm', 'e', -'t', 'a', 'd', 'a', 't', 'a', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\r', 'a', 'l', 'l', 'o', 'w', 'M', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\022', 'U', '\n', '\023', 'm', 'a', 'x', '_', 'o', 'u', 't', 'b', 'o', 'u', 'n', 'd', '_', 'f', 'r', 'a', 'm', 'e', 's', -'\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\021', 'm', 'a', 'x', -'O', 'u', 't', 'b', 'o', 'u', 'n', 'd', 'F', 'r', 'a', 'm', 'e', 's', '\022', 'd', '\n', '\033', 'm', 'a', 'x', '_', 'o', 'u', 't', -'b', 'o', 'u', 'n', 'd', '_', 'c', 'o', 'n', 't', 'r', 'o', 'l', '_', 'f', 'r', 'a', 'm', 'e', 's', '\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', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\030', 'm', 'a', 'x', 'O', 'u', 't', 'b', 'o', -'u', 'n', 'd', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'F', 'r', 'a', 'm', 'e', 's', '\022', '\204', '\001', '\n', '1', 'm', 'a', 'x', '_', -'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', 'f', 'r', 'a', 'm', 'e', -'s', '_', 'w', 'i', 't', 'h', '_', 'e', 'm', 'p', 't', 'y', '_', 'p', 'a', 'y', 'l', 'o', 'a', 'd', '\030', '\t', ' ', '\001', '(', +'\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'C', '\n', '\007', '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', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', '\010', '\001', '2', '\004', '\020', '\300', +'\204', '=', 'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', '?', '\n', '\017', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '_', 'j', +'i', 't', 't', 'e', 'r', '\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', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', 'e', +'r', '\022', 'a', '\n', '\030', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'i', 'd', 'l', 'e', '_', 'i', 'n', 't', 'e', +'r', 'v', 'a', 'l', '\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', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '2', '\004', '\020', '\300', '\204', +'=', 'R', '\026', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'I', 'd', 'l', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', +'\"', '\320', '\016', '\n', '\024', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', +'\022', 'F', '\n', '\020', 'h', 'p', 'a', 'c', 'k', '_', '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', '3', -'2', 'V', 'a', 'l', 'u', 'e', 'R', '+', 'm', 'a', 'x', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'I', 'n', 'b', -'o', 'u', 'n', 'd', 'F', 'r', 'a', 'm', 'e', 's', 'W', 'i', 't', 'h', 'E', 'm', 'p', 't', 'y', 'P', 'a', 'y', 'l', 'o', 'a', -'d', '\022', 'o', '\n', '&', 'm', 'a', 'x', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', -'_', 'f', 'r', 'a', 'm', 'e', 's', '_', 'p', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', '\030', '\n', ' ', '\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', '!', 'm', 'a', 'x', 'I', 'n', 'b', 'o', 'u', 'n', 'd', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'F', -'r', 'a', 'm', 'e', 's', 'P', 'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', '\022', '\221', '\001', '\n', '4', 'm', 'a', 'x', '_', 'i', 'n', -'b', 'o', 'u', 'n', 'd', '_', 'w', 'i', 'n', 'd', 'o', 'w', '_', 'u', 'p', 'd', 'a', 't', 'e', '_', 'f', 'r', 'a', 'm', 'e', -'s', '_', 'p', 'e', 'r', '_', 'd', 'a', 't', 'a', '_', 'f', 'r', 'a', 'm', 'e', '_', 's', 'e', 'n', 't', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', ',', 'm', 'a', 'x', 'I', 'n', 'b', 'o', -'u', 'n', 'd', 'W', 'i', 'n', 'd', 'o', 'w', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'r', 'a', 'm', 'e', 's', 'P', 'e', 'r', 'D', -'a', 't', 'a', 'F', 'r', 'a', 'm', 'e', 'S', 'e', 'n', 't', '\022', '^', '\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', 'i', 'n', 'g', '\030', '\014', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '!', -'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', 'i', 'n', 'g', '\022', 'z', '\n', '-', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', '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', '\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', 'R', '\'', 'o', 'v', 'e', 'r', 'r', 'i', 'd', -'e', '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', '\022', 'z', '\n', '\032', 'c', 'u', 's', 't', 'o', 'm', '_', 's', 'e', 't', 't', 'i', 'n', 'g', -'s', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', '\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', '.', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', -'m', 'e', 't', 'e', 'r', 'R', '\030', 'c', 'u', 's', 't', 'o', 'm', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', -'m', 'e', 't', 'e', 'r', 's', '\022', 'Z', '\n', '\024', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'k', 'e', 'e', 'p', -'a', 'l', 'i', 'v', 'e', '\030', '\017', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'S', 'e', 't', 't', 'i', 'n', -'g', 's', 'R', '\023', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\022', 'P', -'\n', '\021', 'u', 's', 'e', '_', 'o', 'g', 'h', 't', 't', 'p', '2', '_', 'c', 'o', 'd', 'e', 'c', '\030', '\020', ' ', '\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', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\017', 'u', 's', 'e', 'O', 'g', 'h', 't', 't', 'p', '2', -'C', 'o', 'd', 'e', 'c', '\032', '\342', '\001', '\n', '\021', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', -'e', 'r', '\022', 'N', '\n', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\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', '\020', '\372', 'B', '\r', '*', '\006', '\030', '\377', '\377', '\003', '(', '\000', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'i', 'd', 'e', -'n', 't', 'i', 'f', 'i', 'e', 'r', '\022', '<', '\n', '\005', 'v', 'a', 'l', 'u', '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', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '?', '\232', '\305', '\210', '\036', -':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', -'2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', -'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', -'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', '\"', '\245', '\001', '\n', '\023', 'G', 'r', 'p', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', -'t', 'i', 'o', 'n', 's', '\022', '`', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', -'p', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'h', 'p', 'a', 'c', 'k', 'T', 'a', 'b', 'l', 'e', 'S', 'i', 'z', 'e', '\022', 'a', '\n', +'\026', 'm', 'a', 'x', '_', 'c', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', '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', '\r', '\372', 'B', '\n', '*', '\010', '\030', '\377', '\377', '\377', '\377', '\007', '(', '\001', 'R', +'\024', 'm', 'a', 'x', 'C', 'o', 'n', 'c', 'u', 'r', 'r', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm', 's', '\022', 'j', '\n', '\032', +'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'w', 'i', 'n', 'd', 'o', 'w', '_', 's', 'i', 'z', +'e', '\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', '\017', '\372', 'B', '\014', '*', '\n', '\030', '\377', '\377', '\377', '\377', '\007', +'(', '\377', '\377', '\003', 'R', '\027', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'S', 't', 'r', 'e', 'a', 'm', 'W', 'i', 'n', 'd', 'o', 'w', +'S', 'i', 'z', 'e', '\022', 'r', '\n', '\036', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '_', 'w', 'i', 'n', 'd', 'o', 'w', '_', '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', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', +'\017', '\372', 'B', '\014', '*', '\n', '\030', '\377', '\377', '\377', '\377', '\007', '(', '\377', '\377', '\003', 'R', '\033', 'i', 'n', 'i', 't', 'i', 'a', 'l', +'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'W', 'i', 'n', 'd', 'o', 'w', 'S', 'i', 'z', 'e', '\022', '#', '\n', '\r', 'a', +'l', 'l', 'o', 'w', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\014', 'a', 'l', 'l', 'o', 'w', +'C', 'o', 'n', 'n', 'e', 'c', 't', '\022', '%', '\n', '\016', 'a', 'l', 'l', 'o', 'w', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', +'\030', '\006', ' ', '\001', '(', '\010', 'R', '\r', 'a', 'l', 'l', 'o', 'w', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'U', '\n', '\023', +'m', 'a', 'x', '_', 'o', 'u', 't', 'b', 'o', 'u', 'n', 'd', '_', 'f', 'r', 'a', 'm', 'e', 's', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\021', 'm', 'a', 'x', 'O', 'u', 't', 'b', 'o', 'u', +'n', 'd', 'F', 'r', 'a', 'm', 'e', 's', '\022', 'd', '\n', '\033', 'm', 'a', 'x', '_', 'o', 'u', 't', 'b', 'o', 'u', 'n', 'd', '_', +'c', 'o', 'n', 't', 'r', 'o', 'l', '_', 'f', 'r', 'a', 'm', 'e', 's', '\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', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\030', 'm', 'a', 'x', 'O', 'u', 't', 'b', 'o', 'u', 'n', 'd', 'C', 'o', 'n', +'t', 'r', 'o', 'l', 'F', 'r', 'a', 'm', 'e', 's', '\022', '\204', '\001', '\n', '1', 'm', 'a', 'x', '_', 'c', 'o', 'n', 's', 'e', 'c', +'u', 't', 'i', 'v', 'e', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', 'f', 'r', 'a', 'm', 'e', 's', '_', 'w', 'i', 't', 'h', +'_', 'e', 'm', 'p', 't', 'y', '_', 'p', 'a', 'y', 'l', 'o', 'a', 'd', '\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', '+', 'm', 'a', 'x', 'C', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', 'I', 'n', 'b', 'o', 'u', 'n', 'd', 'F', 'r', +'a', 'm', 'e', 's', 'W', 'i', 't', 'h', 'E', 'm', 'p', 't', 'y', 'P', 'a', 'y', 'l', 'o', 'a', 'd', '\022', 'o', '\n', '&', 'm', +'a', 'x', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '_', 'f', 'r', 'a', 'm', 'e', +'s', '_', 'p', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', '\030', '\n', ' ', '\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', '!', +'m', 'a', 'x', 'I', 'n', 'b', 'o', 'u', 'n', 'd', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'F', 'r', 'a', 'm', 'e', 's', 'P', +'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', '\022', '\221', '\001', '\n', '4', 'm', 'a', 'x', '_', 'i', 'n', 'b', 'o', 'u', 'n', 'd', '_', +'w', 'i', 'n', 'd', 'o', 'w', '_', 'u', 'p', 'd', 'a', 't', 'e', '_', 'f', 'r', 'a', 'm', 'e', 's', '_', 'p', 'e', 'r', '_', +'d', 'a', 't', 'a', '_', 'f', 'r', 'a', 'm', 'e', '_', 's', 'e', 'n', 't', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', ',', 'm', 'a', 'x', 'I', 'n', 'b', 'o', 'u', 'n', 'd', 'W', 'i', 'n', +'d', 'o', 'w', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'r', 'a', 'm', 'e', 's', 'P', 'e', 'r', 'D', 'a', 't', 'a', 'F', 'r', 'a', +'m', 'e', 'S', 'e', 'n', 't', '\022', '^', '\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', 'i', 'n', 'g', '\030', '\014', +' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '!', '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', 'i', +'n', 'g', '\022', 'z', '\n', '-', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', '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', '\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', 'R', '\'', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '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', '\022', 'z', '\n', '\032', 'c', 'u', 's', 't', 'o', 'm', '_', 's', 'e', 't', 't', 'i', 'n', 'g', 's', '_', 'p', 'a', 'r', 'a', +'m', 'e', 't', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', '\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', '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', '\"', -'\261', '\002', '\n', '\024', 'H', 't', 't', 'p', '3', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', -']', '\n', '\025', 'q', 'u', 'i', 'c', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', -'\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', -'.', 'v', '3', '.', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\023', -'q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'z', '\n', '-', 'o', 'v', -'e', 'r', 'r', 'i', 'd', 'e', '_', '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', '\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', '\'', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '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', '\022', '>', '\n', '\026', 'a', 'l', 'l', -'o', 'w', '_', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'd', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '\030', '\005', ' ', '\001', '(', '\010', -'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\024', 'a', 'l', 'l', 'o', 'w', 'E', 'x', 't', 'e', 'n', 'd', 'e', 'd', -'C', 'o', 'n', 'n', 'e', 'c', 't', '\"', 't', '\n', '\032', 'S', 'c', 'h', 'e', 'm', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', -'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', 'D', '\n', '\023', 's', 'c', 'h', 'e', 'm', 'e', '_', 't', 'o', -'_', 'o', 'v', 'e', 'r', 'w', 'r', 'i', 't', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\022', '\372', 'B', '\017', 'r', '\r', 'R', '\004', -'h', 't', 't', 'p', 'R', '\005', 'h', 't', 't', 'p', 's', 'H', '\000', 'R', '\021', 's', 'c', 'h', 'e', 'm', 'e', 'T', 'o', 'O', 'v', -'e', 'r', 'w', 'r', 'i', 't', 'e', 'B', '\020', '\n', '\016', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', -'B', '\201', '\001', '\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', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', -'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', -'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', -'\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'p', 't', 'i', 'o', 'n', 's', '.', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'R', +'\030', 'c', 'u', 's', 't', 'o', 'm', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', +'\022', 'Z', '\n', '\024', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'k', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\030', +'\017', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'R', '\023', 'c', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\022', 'P', '\n', '\021', 'u', 's', 'e', '_', +'o', 'g', 'h', 't', 't', 'p', '2', '_', 'c', 'o', 'd', 'e', 'c', '\030', '\020', ' ', '\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', '\322', +'\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\017', 'u', 's', 'e', 'O', 'g', 'h', 't', 't', 'p', '2', 'C', 'o', 'd', 'e', 'c', '\032', +'\342', '\001', '\n', '\021', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', 'N', '\n', '\n', +'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\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', '\020', '\372', 'B', +'\r', '*', '\006', '\030', '\377', '\377', '\003', '(', '\000', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', +'r', '\022', '<', '\n', '\005', 'v', 'a', 'l', 'u', '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', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', +'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'P', 'a', 'r', 'a', 'm', 'e', +'t', 'e', 'r', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'c', 'o', 'r', 'e', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', +'\"', '\245', '\001', '\n', '\023', 'G', 'r', 'p', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', +'`', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', +'\030', '\001', ' ', '\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', +'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', '\"', '\330', '\002', '\n', '\024', 'H', 't', +'t', 'p', '3', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\025', 'q', 'u', 'i', +'c', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', +')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'Q', 'u', +'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\023', 'q', 'u', 'i', 'c', 'P', 'r', +'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'z', '\n', '-', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', +'_', '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', '\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', '\'', 'o', 'v', +'e', 'r', 'r', 'i', 'd', 'e', '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', '\022', '>', '\n', '\026', 'a', 'l', 'l', 'o', 'w', '_', 'e', 'x', 't', +'e', 'n', 'd', 'e', 'd', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '\030', '\005', ' ', '\001', '(', '\010', 'B', '\010', '\322', '\306', '\244', '\341', +'\006', '\002', '\010', '\001', 'R', '\024', 'a', 'l', 'l', 'o', 'w', 'E', 'x', 't', 'e', 'n', 'd', 'e', 'd', 'C', 'o', 'n', 'n', 'e', 'c', +'t', '\022', '%', '\n', '\016', 'a', 'l', 'l', 'o', 'w', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\006', ' ', '\001', '(', '\010', +'R', '\r', 'a', 'l', 'l', 'o', 'w', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\"', '\233', '\001', '\n', '\032', 'S', 'c', 'h', 'e', 'm', +'e', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', 'D', '\n', '\023', +'s', 'c', 'h', 'e', 'm', 'e', '_', 't', 'o', '_', 'o', 'v', 'e', 'r', 'w', 'r', 'i', 't', 'e', '\030', '\001', ' ', '\001', '(', '\t', +'B', '\022', '\372', 'B', '\017', 'r', '\r', 'R', '\004', 'h', 't', 't', 'p', 'R', '\005', 'h', 't', 't', 'p', 's', 'H', '\000', 'R', '\021', 's', +'c', 'h', 'e', 'm', 'e', 'T', 'o', 'O', 'v', 'e', 'r', 'w', 'r', 'i', 't', 'e', '\022', '%', '\n', '\016', 'm', 'a', 't', 'c', 'h', +'_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\r', 'm', 'a', 't', 'c', 'h', 'U', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'B', '\020', '\n', '\016', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', 'B', '\201', +'\001', '\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', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', +'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', +'/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', ';', 'c', 'o', 'r', 'e', 'v', '3', '\272', '\200', '\310', +'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[10] = { @@ -310,5 +317,5 @@ _upb_DefPool_Init envoy_config_core_v3_protocol_proto_upbdefinit = { deps, &envoy_config_core_v3_protocol_proto_upb_file_layout, "envoy/config/core/v3/protocol.proto", - UPB_STRINGVIEW_INIT(descriptor, 6815) + UPB_STRINGVIEW_INIT(descriptor, 6988) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c index 62e23df756..c8d984a85c 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.c @@ -17,7 +17,7 @@ extern _upb_DefPool_Init google_protobuf_wrappers_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[2499] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', +static const char descriptor[2559] = {'\n', '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', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', @@ -80,43 +80,46 @@ static const char descriptor[2499] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', ' '\"', '.', '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', 'l', 'e', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '0', '\n', '\024', 'l', 'e', 'd', 's', '_', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', -'(', '\t', 'R', '\022', 'l', 'e', 'd', 's', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'N', 'a', 'm', 'e', '\"', '\341', '\005', +'(', '\t', 'R', '\022', 'l', 'e', 'd', 's', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'N', 'a', 'm', 'e', '\"', '\235', '\006', '\n', '\023', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', ':', '\n', '\010', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\030', '\001', ' ', '\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', 'G', '\n', '\014', 'l', 'b', '_', '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', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'R', '\013', 'l', 'b', 'E', 'n', 'd', 'p', 'o', -'i', 'n', 't', 's', '\022', 'v', '\n', '\027', 'l', 'o', 'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', 'r', '_', 'e', 'n', 'd', -'p', 'o', 'i', 'n', 't', 's', '\030', '\007', ' ', '\001', '(', '\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', '.', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'i', 's', 't', 'H', -'\000', 'R', '\025', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', -'v', '\n', '\034', 'l', 'e', 'd', 's', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', -'c', 'o', 'n', 'f', 'i', 'g', '\030', '\010', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'L', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', -'r', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\031', 'l', 'e', 'd', 's', 'C', 'l', -'u', 's', 't', 'e', 'r', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\025', 'l', 'o', -'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', '_', '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', '\023', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', -'c', 'i', 'n', 'g', 'W', 'e', 'i', 'g', 'h', 't', '\022', '$', '\n', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\005', ' ', -'\001', '(', '\r', 'B', '\010', '\372', 'B', '\005', '*', '\003', '\030', '\200', '\001', 'R', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', ':', -'\n', '\t', 'p', 'r', 'o', 'x', 'i', 'm', 'i', 't', 'y', '\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', '\t', 'p', -'r', 'o', 'x', 'i', 'm', 'i', 't', 'y', '\032', 'Y', '\n', '\016', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'i', 's', -'t', '\022', 'G', '\n', '\014', 'l', 'b', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', '\001', ' ', '\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', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'R', '\013', 'l', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', ':', -'0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', -'o', 'i', 'n', 't', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'B', -'\013', '\n', '\t', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\227', '\001', '\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', '\027', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', -'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'c', 'a', 'l', 'i', 't', 'y', '\022', ':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\t', ' ', '\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', 'G', '\n', '\014', 'l', 'b', '_', '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', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', +'t', 'R', '\013', 'l', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', 'v', '\n', '\027', 'l', 'o', 'a', 'd', '_', 'b', 'a', +'l', 'a', 'n', 'c', 'e', 'r', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', '\007', ' ', '\001', '(', '\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', '.', 'L', 'b', 'E', 'n', 'd', +'p', 'o', 'i', 'n', 't', 'L', 'i', 's', 't', 'H', '\000', 'R', '\025', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'r', +'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', 'v', '\n', '\034', 'l', 'e', 'd', 's', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', +'_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\010', ' ', '\001', '(', '\013', '2', '3', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', +'L', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'C', 'o', 'n', 'f', 'i', 'g', +'H', '\000', 'R', '\031', 'l', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'C', 'o', +'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\025', 'l', 'o', 'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', '_', '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', +'\023', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'W', 'e', 'i', 'g', 'h', 't', '\022', '$', '\n', '\010', 'p', +'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\005', ' ', '\001', '(', '\r', 'B', '\010', '\372', 'B', '\005', '*', '\003', '\030', '\200', '\001', 'R', '\010', +'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', ':', '\n', '\t', 'p', 'r', 'o', 'x', 'i', 'm', 'i', 't', 'y', '\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', '\t', 'p', 'r', 'o', 'x', 'i', 'm', 'i', 't', 'y', '\032', 'Y', '\n', '\016', 'L', 'b', 'E', +'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'i', 's', 't', '\022', 'G', '\n', '\014', 'l', 'b', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', +'t', 's', '\030', '\001', ' ', '\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', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'R', '\013', 'l', 'b', +'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', +'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'B', '\013', '\n', '\t', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\227', '\001', +'\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', '\027', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', +'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', +'.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', +'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', +'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[9] = { @@ -135,5 +138,5 @@ _upb_DefPool_Init envoy_config_endpoint_v3_endpoint_components_proto_upbdefinit deps, &envoy_config_endpoint_v3_endpoint_components_proto_upb_file_layout, "envoy/config/endpoint/v3/endpoint_components.proto", - UPB_STRINGVIEW_INIT(descriptor, 2499) + UPB_STRINGVIEW_INIT(descriptor, 2559) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c index a086dc1b14..3fd2033650 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.c @@ -13,10 +13,11 @@ extern _upb_DefPool_Init envoy_config_core_v3_address_proto_upbdefinit; extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit; +extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[2428] = {'\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[3123] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', '/', 'l', 'o', 'a', 'd', '_', 'r', 'e', 'p', 'o', 'r', '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', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', @@ -24,103 +25,131 @@ static const char descriptor[2428] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', ' '/', 'v', '3', '/', 'b', 'a', 's', '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', '\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', '\"', '\312', '\004', '\n', '\025', 'U', 'p', 's', -'t', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', '\022', ':', '\n', '\010', 'l', 'o', 'c', -'a', 'l', 'i', 't', 'y', '\030', '\001', ' ', '\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', '\031', 't', 'o', 't', 'a', 'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', '_', 'r', -'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'S', 'u', 'c', 'c', 'e', -'s', 's', 'f', 'u', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', ';', '\n', '\032', 't', 'o', 't', 'a', 'l', '_', 'r', 'e', -'q', 'u', 'e', 's', 't', 's', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', -'\027', 't', 'o', 't', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\022', -'0', '\n', '\024', 't', 'o', 't', 'a', 'l', '_', 'e', 'r', 'r', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\004', -' ', '\001', '(', '\004', 'R', '\022', 't', 'o', 't', 'a', 'l', 'E', 'r', 'r', 'o', 'r', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', -'2', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'i', 's', 's', 'u', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', -'\010', ' ', '\001', '(', '\004', 'R', '\023', 't', 'o', 't', 'a', 'l', 'I', 's', 's', 'u', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', -'s', '\022', ']', '\n', '\021', 'l', 'o', 'a', 'd', '_', 'm', 'e', 't', 'r', 'i', 'c', '_', 's', 't', 'a', 't', 's', '\030', '\005', ' ', -'\003', '(', '\013', '2', '1', '.', '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', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', -'t', 'a', 't', 's', 'R', '\017', 'l', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', 'g', '\n', '\027', -'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 't', 's', '\030', '\007', -' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', -'i', 'n', 't', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', -'a', 't', 's', 'R', '\025', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', -'s', '\022', '\032', '\n', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\006', ' ', '\001', '(', '\r', 'R', '\010', 'p', 'r', 'i', 'o', -'r', 'i', 't', 'y', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', -'.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', -'y', 'S', 't', 'a', 't', 's', '\"', '\367', '\003', '\n', '\025', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', -'n', 't', 'S', 't', 'a', 't', 's', '\022', '7', '\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', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', '3', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', '\030', '\006', ' ', '\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', '\031', 't', 'o', 't', 'a', -'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\002', ' ', '\001', -'(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'R', 'e', 'q', 'u', 'e', 's', -'t', 's', '\022', ';', '\n', '\032', 't', 'o', 't', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'i', 'n', '_', 'p', -'r', 'o', 'g', 'r', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'R', 'e', 'q', 'u', 'e', -'s', 't', 's', 'I', 'n', 'P', 'r', 'o', 'g', 'r', 'e', 's', 's', '\022', '0', '\n', '\024', 't', 'o', 't', 'a', 'l', '_', 'e', 'r', -'r', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\022', 't', 'o', 't', 'a', 'l', -'E', 'r', 'r', 'o', 'r', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', '2', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'i', 's', -'s', 'u', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\007', ' ', '\001', '(', '\004', 'R', '\023', 't', 'o', 't', 'a', -'l', 'I', 's', 's', 'u', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', ']', '\n', '\021', 'l', 'o', 'a', 'd', '_', 'm', -'e', 't', 'r', 'i', 'c', '_', 's', 't', 'a', 't', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', '1', '.', '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', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\017', 'l', 'o', 'a', 'd', 'M', -'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', -'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', '\"', '\350', '\001', '\n', '\027', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', -'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', '\037', '\n', '\013', 'm', 'e', 't', 'r', 'i', 'c', -'_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\n', 'm', 'e', 't', 'r', 'i', 'c', 'N', 'a', 'm', 'e', '\022', 'H', -'\n', '!', 'n', 'u', 'm', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'f', 'i', 'n', 'i', 's', 'h', 'e', 'd', '_', 'w', -'i', 't', 'h', '_', 'm', 'e', 't', 'r', 'i', 'c', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\035', 'n', 'u', 'm', 'R', 'e', 'q', 'u', -'e', 's', 't', 's', 'F', 'i', 'n', 'i', 's', 'h', 'e', 'd', 'W', 'i', 't', 'h', 'M', 'e', 't', 'r', 'i', 'c', '\022', ',', '\n', -'\022', 't', 'o', 't', 'a', 'l', '_', 'm', 'e', 't', 'r', 'i', 'c', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\001', -'R', '\020', 't', 'o', 't', 'a', 'l', 'M', 'e', 't', 'r', 'i', 'c', 'V', 'a', 'l', 'u', 'e', ':', '4', '\232', '\305', '\210', '\036', '/', -'\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'E', -'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\"', '\211', '\005', -'\n', '\014', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\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', '0', '\n', '\024', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'e', 'r', 'v', 'i', -'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\022', 'c', 'l', 'u', 's', 't', 'e', 'r', 'S', 'e', 'r', -'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', '\022', 'q', '\n', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'l', 'o', 'c', 'a', -'l', 'i', 't', 'y', '_', 's', 't', 'a', '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', '.', 'U', 'p', 's', 't', 'r', 'e', -'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', -'R', '\025', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', '\022', '4', -'\n', '\026', 't', 'o', 't', 'a', 'l', '_', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', -'\003', ' ', '\001', '(', '\004', 'R', '\024', 't', 'o', 't', 'a', 'l', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', -'t', 's', '\022', 'a', '\n', '\020', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\005', ' ', -'\003', '(', '\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', 'S', 't', 'a', 't', 's', '.', 'D', 'r', 'o', 'p', 'p', 'e', -'d', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'R', '\017', 'd', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', -'s', '\022', 'K', '\n', '\024', 'l', 'o', 'a', 'd', '_', 'r', 'e', 'p', 'o', 'r', 't', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', -'\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', '\022', 'l', 'o', 'a', 'd', 'R', 'e', 'p', 'o', 'r', 't', 'I', 'n', 't', 'e', 'r', -'v', 'a', 'l', '\032', '\226', '\001', '\n', '\017', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\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', '#', '\n', '\r', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'c', 'o', 'u', -'n', 't', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\014', 'd', 'r', 'o', 'p', 'p', 'e', 'd', 'C', 'o', 'u', 'n', 't', ':', '9', '\232', -'\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', -'n', 't', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '.', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', -'q', 'u', 'e', 's', 't', 's', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'B', -'\217', '\001', '\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', '\017', 'L', 'o', 'a', 'd', 'R', 'e', -'p', 'o', 'r', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', -'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', -'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', -'t', 'o', '3', +'o', '\032', '\037', 'x', 'd', 's', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', '3', '/', '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', +'\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', +'\"', '\305', '\010', '\n', '\025', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', +'s', '\022', ':', '\n', '\010', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\030', '\001', ' ', '\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', '\031', 't', 'o', 't', 'a', 'l', '_', 's', 'u', 'c', 'c', +'e', 's', 's', 'f', 'u', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', +'t', 'a', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', ';', '\n', '\032', +'t', 'o', 't', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', +'s', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'I', 'n', 'P', +'r', 'o', 'g', 'r', 'e', 's', 's', '\022', '0', '\n', '\024', 't', 'o', 't', 'a', 'l', '_', 'e', 'r', 'r', 'o', 'r', '_', 'r', 'e', +'q', 'u', 'e', 's', 't', 's', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\022', 't', 'o', 't', 'a', 'l', 'E', 'r', 'r', 'o', 'r', 'R', +'e', 'q', 'u', 'e', 's', 't', 's', '\022', '2', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'i', 's', 's', 'u', 'e', 'd', '_', 'r', +'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\010', ' ', '\001', '(', '\004', 'R', '\023', 't', 'o', 't', 'a', 'l', 'I', 's', 's', 'u', 'e', +'d', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', 'B', '\n', '\030', 't', 'o', 't', 'a', 'l', '_', 'a', 'c', 't', 'i', 'v', 'e', +'_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\030', '\t', ' ', '\001', '(', '\004', 'B', '\010', '\322', '\306', '\244', '\341', '\006', +'\002', '\010', '\001', 'R', '\026', 't', 'o', 't', 'a', 'l', 'A', 'c', 't', 'i', 'v', 'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', 's', '\022', '<', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'n', 'e', 'w', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', 's', '\030', '\n', ' ', '\001', '(', '\004', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\023', 't', 'o', 't', 'a', 'l', +'N', 'e', 'w', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\022', '>', '\n', '\026', 't', 'o', 't', 'a', 'l', '_', 'f', +'a', 'i', 'l', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '\030', '\013', ' ', '\001', '(', '\004', 'B', '\010', '\322', '\306', +'\244', '\341', '\006', '\002', '\010', '\001', 'R', '\024', 't', 'o', 't', 'a', 'l', 'F', 'a', 'i', 'l', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', 's', '\022', 'a', '\n', '\017', 'c', 'p', 'u', '_', 'u', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', '\030', '\014', ' ', +'\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', +'n', 't', '.', 'v', '3', '.', 'U', 'n', 'n', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', +'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\016', 'c', 'p', 'u', 'U', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', +'o', 'n', '\022', 'a', '\n', '\017', 'm', 'e', 'm', '_', 'u', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', '\030', '\r', ' ', '\001', +'(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', +'t', '.', 'v', '3', '.', 'U', 'n', 'n', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', +'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\016', 'm', 'e', 'm', 'U', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', 'o', +'n', '\022', 'q', '\n', '\027', 'a', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', '_', 'u', 't', 'i', 'l', 'i', 'z', 'a', 't', +'i', 'o', 'n', '\030', '\016', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'U', 'n', 'n', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', +'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\026', 'a', 'p', 'p', 'l', 'i', 'c', +'a', 't', 'i', 'o', 'n', 'U', 't', 'i', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', '\022', ']', '\n', '\021', 'l', 'o', 'a', 'd', '_', +'m', 'e', 't', 'r', 'i', 'c', '_', 's', 't', 'a', 't', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', '1', '.', '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', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\017', 'l', 'o', 'a', 'd', +'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', 'g', '\n', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', +'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 't', 's', '\030', '\007', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'U', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', 'R', '\025', 'u', 'p', 's', 't', 'r', +'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', '\022', '\032', '\n', '\010', 'p', 'r', 'i', 'o', 'r', +'i', 't', 'y', '\030', '\006', ' ', '\001', '(', '\r', 'R', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', ':', '2', '\232', '\305', '\210', '\036', +'-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', +'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', '\"', '\367', '\003', '\n', +'\025', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 't', 's', '\022', '7', '\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', 'R', '\007', 'a', 'd', 'd', +'r', 'e', 's', 's', '\022', '3', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\006', ' ', '\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', '\031', 't', 'o', 't', 'a', 'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', +'u', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'S', +'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', ';', '\n', '\032', 't', 'o', 't', 'a', +'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'i', 'n', '_', 'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\030', '\003', ' ', +'\001', '(', '\004', 'R', '\027', 't', 'o', 't', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'I', 'n', 'P', 'r', 'o', 'g', 'r', +'e', 's', 's', '\022', '0', '\n', '\024', 't', 'o', 't', 'a', 'l', '_', 'e', 'r', 'r', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', +'t', 's', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\022', 't', 'o', 't', 'a', 'l', 'E', 'r', 'r', 'o', 'r', 'R', 'e', 'q', 'u', 'e', +'s', 't', 's', '\022', '2', '\n', '\025', 't', 'o', 't', 'a', 'l', '_', 'i', 's', 's', 'u', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', +'s', 't', 's', '\030', '\007', ' ', '\001', '(', '\004', 'R', '\023', 't', 'o', 't', 'a', 'l', 'I', 's', 's', 'u', 'e', 'd', 'R', 'e', 'q', +'u', 'e', 's', 't', 's', '\022', ']', '\n', '\021', 'l', 'o', 'a', 'd', '_', 'm', 'e', 't', 'r', 'i', 'c', '_', 's', 't', 'a', 't', +'s', '\030', '\005', ' ', '\003', '(', '\013', '2', '1', '.', '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', 'L', 'o', 'a', 'd', 'M', 'e', 't', +'r', 'i', 'c', 'S', 't', 'a', 't', 's', 'R', '\017', 'l', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', +':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', +'p', 'o', 'i', 'n', 't', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', +'t', 's', '\"', '\350', '\001', '\n', '\027', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', +'S', 't', 'a', 't', 's', '\022', '\037', '\n', '\013', 'm', 'e', 't', 'r', 'i', 'c', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\n', 'm', 'e', 't', 'r', 'i', 'c', 'N', 'a', 'm', 'e', '\022', 'H', '\n', '!', 'n', 'u', 'm', '_', 'r', 'e', 'q', 'u', +'e', 's', 't', 's', '_', 'f', 'i', 'n', 'i', 's', 'h', 'e', 'd', '_', 'w', 'i', 't', 'h', '_', 'm', 'e', 't', 'r', 'i', 'c', +'\030', '\002', ' ', '\001', '(', '\004', 'R', '\035', 'n', 'u', 'm', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'F', 'i', 'n', 'i', 's', 'h', +'e', 'd', 'W', 'i', 't', 'h', 'M', 'e', 't', 'r', 'i', 'c', '\022', ',', '\n', '\022', 't', 'o', 't', 'a', 'l', '_', 'm', 'e', 't', +'r', 'i', 'c', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\001', 'R', '\020', 't', 'o', 't', 'a', 'l', 'M', 'e', 't', +'r', 'i', 'c', 'V', 'a', 'l', 'u', 'e', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', +'d', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\"', '\230', '\001', '\n', '\036', 'U', 'n', 'n', 'a', 'm', 'e', 'd', 'E', +'n', 'd', 'p', 'o', 'i', 'n', 't', 'L', 'o', 'a', 'd', 'M', 'e', 't', 'r', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', 'H', '\n', +'!', 'n', 'u', 'm', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'f', 'i', 'n', 'i', 's', 'h', 'e', 'd', '_', 'w', 'i', +'t', 'h', '_', 'm', 'e', 't', 'r', 'i', 'c', '\030', '\001', ' ', '\001', '(', '\004', 'R', '\035', 'n', 'u', 'm', 'R', 'e', 'q', 'u', 'e', +'s', 't', 's', 'F', 'i', 'n', 'i', 's', 'h', 'e', 'd', 'W', 'i', 't', 'h', 'M', 'e', 't', 'r', 'i', 'c', '\022', ',', '\n', '\022', +'t', 'o', 't', 'a', 'l', '_', 'm', 'e', 't', 'r', 'i', 'c', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\001', 'R', +'\020', 't', 'o', 't', 'a', 'l', 'M', 'e', 't', 'r', 'i', 'c', 'V', 'a', 'l', 'u', 'e', '\"', '\211', '\005', '\n', '\014', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\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', '0', '\n', '\024', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', +'m', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\022', 'c', 'l', 'u', 's', 't', 'e', 'r', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'N', +'a', 'm', 'e', '\022', 'q', '\n', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', +'s', 't', 'a', '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', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', 'o', 'c', +'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\025', 'u', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'S', 't', 'a', 't', 's', '\022', '4', '\n', '\026', 't', 'o', 't', +'a', 'l', '_', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\003', ' ', '\001', '(', '\004', +'R', '\024', 't', 'o', 't', 'a', 'l', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', 'a', '\n', +'\020', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\005', ' ', '\003', '(', '\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', 'S', 't', 'a', 't', 's', '.', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', +'e', 's', 't', 's', 'R', '\017', 'd', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', 'K', '\n', '\024', +'l', 'o', 'a', 'd', '_', 'r', 'e', 'p', 'o', 'r', 't', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\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', '\022', 'l', 'o', 'a', 'd', 'R', 'e', 'p', 'o', 'r', 't', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\032', '\226', +'\001', '\n', '\017', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\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', '#', '\n', '\r', 'd', 'r', 'o', 'p', 'p', 'e', 'd', '_', 'c', 'o', 'u', 'n', 't', '\030', '\002', ' ', +'\001', '(', '\004', 'R', '\014', 'd', 'r', 'o', 'p', 'p', 'e', 'd', 'C', 'o', 'u', 'n', 't', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', +'2', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'C', 'l', +'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '.', 'D', 'r', 'o', 'p', 'p', 'e', 'd', 'R', 'e', 'q', 'u', 'e', 's', 't', +'s', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'e', 'n', +'d', 'p', 'o', 'i', 'n', 't', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'B', '\217', '\001', '\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', '\017', 'L', 'o', 'a', 'd', 'R', 'e', 'p', 'o', 'r', 't', 'P', +'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', +'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static _upb_DefPool_Init *deps[8] = { +static _upb_DefPool_Init *deps[9] = { &envoy_config_core_v3_address_proto_upbdefinit, &envoy_config_core_v3_base_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &google_protobuf_struct_proto_upbdefinit, + &xds_annotations_v3_status_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, &validate_validate_proto_upbdefinit, @@ -131,5 +160,5 @@ _upb_DefPool_Init envoy_config_endpoint_v3_load_report_proto_upbdefinit = { deps, &envoy_config_endpoint_v3_load_report_proto_upb_file_layout, "envoy/config/endpoint/v3/load_report.proto", - UPB_STRINGVIEW_INIT(descriptor, 2428) + UPB_STRINGVIEW_INIT(descriptor, 3123) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h index 5e8cbfd3a0..f26c2d0ee1 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/load_report.upbdefs.h @@ -33,6 +33,11 @@ UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_EndpointLoadMetricStat return upb_DefPool_FindMessageByName(s, "envoy.config.endpoint.v3.EndpointLoadMetricStats"); } +UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_endpoint_v3_load_report_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.endpoint.v3.UnnamedEndpointLoadMetricStats"); +} + UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_ClusterStats_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_endpoint_v3_load_report_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.endpoint.v3.ClusterStats"); diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c index ac79c46139..809842efb0 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.c @@ -27,7 +27,7 @@ extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4281] = {'\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[4337] = {'\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', @@ -66,7 +66,7 @@ static const char descriptor[4281] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', '\"', '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', '\"', '\206', '\030', '\n', '\010', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', +'i', 'e', 's', '\"', '\276', '\030', '\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', '7', '\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', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', '^', '\n', '\024', 'a', 'd', 'd', @@ -163,42 +163,44 @@ static const char descriptor[4281] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 't', 'e', 'n', 'e', 'r', '\022', '!', '\n', '\014', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'm', 'p', 't', 'c', 'p', '\030', '\036', ' ', '\001', '(', '\010', 'R', '\013', 'e', 'n', 'a', 'b', 'l', 'e', 'M', 'p', 't', 'c', 'p', '\022', '7', '\n', '\030', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'g', 'l', 'o', 'b', 'a', 'l', '_', 'c', 'o', 'n', 'n', '_', 'l', 'i', 'm', 'i', 't', '\030', '\037', ' ', '\001', '(', '\010', 'R', -'\025', 'i', 'g', 'n', 'o', 'r', 'e', 'G', 'l', 'o', 'b', 'a', 'l', 'C', 'o', 'n', 'n', 'L', 'i', 'm', 'i', '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', '\374', '\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', '\022', 'S', '\n', '\016', 'e', 'x', 't', 'e', 'n', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', -'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', 'H', '\000', 'R', '\r', 'e', 'x', 't', 'e', 'n', 'd', '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', '\032', '\030', '\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', -'i', 'g', '\"', ')', '\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', -'B', '\024', '\n', '\022', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', -'\016', '\020', '\017', 'J', '\004', '\010', '\027', '\020', '\030', '\"', '\021', '\n', '\017', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'M', 'a', 'n', 'a', -'g', 'e', 'r', '\"', '\033', '\n', '\031', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', -'M', 'a', 'n', 'a', 'g', 'e', 'r', '\"', '\024', '\n', '\022', 'A', 'p', 'i', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'M', 'a', 'n', -'a', 'g', 'e', 'r', 'B', '\215', '\001', '\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', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', -'m', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', -'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', -'p', 'r', 'o', 't', 'o', '3', +'\025', 'i', 'g', 'n', 'o', 'r', 'e', 'G', 'l', 'o', 'b', 'a', 'l', 'C', 'o', 'n', 'n', 'L', 'i', 'm', 'i', 't', '\022', '6', '\n', +'\027', 'b', 'y', 'p', 'a', 's', 's', '_', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', +'#', ' ', '\001', '(', '\010', 'R', '\025', 'b', 'y', 'p', 'a', 's', 's', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', +'g', 'e', 'r', '\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', +'\374', '\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', '\022', 'S', '\n', '\016', 'e', 'x', 't', 'e', 'n', 'd', '_', +'b', 'a', 'l', 'a', 'n', 'c', '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', 'H', '\000', 'R', '\r', 'e', 'x', 't', 'e', 'n', 'd', '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', '\032', '\030', '\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'L', 'i', 's', 't', 'e', 'n', +'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\"', ')', '\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', 'B', '\024', '\n', '\022', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', +'i', 'e', 'r', 'J', '\004', '\010', '\016', '\020', '\017', 'J', '\004', '\010', '\027', '\020', '\030', '\"', '\021', '\n', '\017', 'L', 'i', 's', 't', 'e', 'n', +'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\"', '\033', '\n', '\031', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'L', 'i', +'s', 't', 'e', 'n', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\"', '\024', '\n', '\022', 'A', 'p', 'i', 'L', 'i', 's', 't', 'e', +'n', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'B', '\215', '\001', '\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', 'Z', 'J', 'g', 'i', 't', +'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', +'t', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', +'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[19] = { @@ -227,5 +229,5 @@ _upb_DefPool_Init envoy_config_listener_v3_listener_proto_upbdefinit = { deps, &envoy_config_listener_v3_listener_proto_upb_file_layout, "envoy/config/listener/v3/listener.proto", - UPB_STRINGVIEW_INIT(descriptor, 4281) + UPB_STRINGVIEW_INIT(descriptor, 4337) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c index a3d587f4e0..70dc8a2a80 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.c @@ -18,7 +18,7 @@ extern _upb_DefPool_Init xds_annotations_v3_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[1455] = {'\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[1665] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', '/', 'q', 'u', 'i', 'c', '_', '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', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', @@ -32,7 +32,7 @@ static const char descriptor[1455] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', ' '\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', '\007', '\n', '\023', 'Q', 'u', 'i', 'c', +'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\366', '\010', '\n', '\023', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\025', 'q', 'u', 'i', 'c', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'Q', 'u', 'i', 'c', 'P', @@ -68,15 +68,23 @@ static const char descriptor[1455] = {'\n', '*', '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', 'B', '\010', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\034', 's', 'e', 'r', 'v', 'e', 'r', 'P', 'r', 'e', 'f', 'e', 'r', 'r', 'e', 'd', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', 'o', 'n', 'f', 'i', -'g', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', -'s', 't', 'e', 'n', 'e', 'r', '.', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', -'s', 'B', '\217', '\001', '\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', '\017', 'Q', 'u', 'i', 'c', -'C', 'o', 'n', 'f', 'i', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', -'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', -'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', -'r', 'o', 't', 'o', '3', +'g', '\022', ']', '\n', '\035', 's', 'e', 'n', 'd', '_', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', +'m', 'i', 'g', 'r', 'a', 't', 'i', 'o', 'n', '\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', '\032', 's', 'e', 'n', 'd', 'D', +'i', 's', 'a', 'b', 'l', 'e', 'A', 'c', 't', 'i', 'v', 'e', 'M', 'i', 'g', 'r', 'a', 't', 'i', 'o', 'n', '\022', 'q', '\n', '\037', +'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'd', 'e', 'b', 'u', 'g', '_', 'v', 'i', 's', 'i', 't', 'o', 'r', '_', +'c', 'o', 'n', 'f', 'i', 'g', '\030', '\013', ' ', '\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', '\034', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'D', 'e', 'b', 'u', 'g', 'V', 'i', +'s', 'i', 't', 'o', 'r', 'C', 'o', 'n', 'f', 'i', 'g', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'Q', 'u', 'i', 'c', 'P', 'r', 'o', 't', +'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\217', '\001', '\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', '\017', 'Q', 'u', 'i', 'c', 'C', 'o', 'n', 'f', 'i', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'J', +'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', +'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', +'\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[10] = { @@ -96,5 +104,5 @@ _upb_DefPool_Init envoy_config_listener_v3_quic_config_proto_upbdefinit = { deps, &envoy_config_listener_v3_quic_config_proto_upb_file_layout, "envoy/config/listener/v3/quic_config.proto", - UPB_STRINGVIEW_INIT(descriptor, 1455) + UPB_STRINGVIEW_INIT(descriptor, 1665) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c index 863f58c3f9..c746e84817 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.c @@ -24,7 +24,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4221] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', +static const char descriptor[4302] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 'a', 'c', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', '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', @@ -98,7 +98,7 @@ static const char descriptor[4221] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/' 'e', 'd', 'E', 'x', 'p', 'r', 'B', '\034', '\362', '\230', '\376', '\217', '\005', '\026', '\022', '\024', 'e', 'x', 'p', 'r', 'e', 's', 's', 'i', 'o', 'n', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\020', 'c', 'h', 'e', 'c', 'k', 'e', 'd', 'C', 'o', 'n', 'd', 'i', 't', 'i', 'o', 'n', ':', '\"', '\232', '\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\332', '\007', '\n', '\n', 'P', 'e', 'r', 'm', 'i', +'.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\253', '\010', '\n', '\n', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '\022', 'C', '\n', '\t', 'a', 'n', 'd', '_', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '.', 'S', 'e', 't', 'H', '\000', 'R', '\010', 'a', 'n', 'd', 'R', 'u', 'l', 'e', 's', '\022', @@ -131,68 +131,72 @@ static const char descriptor[4221] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/' 'e', 'd', 'S', 'e', 'r', 'v', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'F', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\014', ' ', '\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', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\032', 's', '\n', '\003', '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', '.', 'r', 'b', 'a', -'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', -'R', '\005', 'r', 'u', 'l', 'e', 's', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', '.', 'S', 'e', -'t', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', -'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', -'\003', '\370', 'B', '\001', '\"', '\353', '\010', '\n', '\t', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '\022', '>', '\n', '\007', 'a', 'n', 'd', -'_', 'i', 'd', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', -'\006', 'a', 'n', 'd', 'I', 'd', 's', '\022', '<', '\n', '\006', 'o', 'r', '_', 'i', 'd', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', -'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', '\005', 'o', 'r', 'I', 'd', 's', '\022', '\033', '\n', '\003', 'a', 'n', -'y', '\030', '\003', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\003', 'a', 'n', 'y', '\022', 'U', -'\n', '\r', 'a', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '-', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', -'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'H', '\000', 'R', '\r', 'a', 'u', 't', -'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\t', 's', 'o', 'u', 'r', 'c', 'e', '_', 'i', 'p', '\030', '\005', -' ', '\001', '(', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', -'H', '\000', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', '\022', 'K', '\n', '\020', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', -'m', 'o', 't', 'e', '_', 'i', 'p', '\030', '\n', ' ', '\001', '(', '\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', 'H', '\000', 'R', '\016', -'d', 'i', 'r', 'e', 'c', 't', 'R', 'e', 'm', 'o', 't', 'e', 'I', 'p', '\022', '>', '\n', '\t', 'r', 'e', 'm', 'o', 't', 'e', '_', -'i', 'p', '\030', '\013', ' ', '\001', '(', '\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', 'H', '\000', 'R', '\010', 'r', 'e', 'm', 'o', 't', -'e', 'I', 'p', '\022', '>', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\006', ' ', '\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', 'H', '\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', '\n', '\010', 'u', 'r', 'l', '_', -'p', 'a', 't', 'h', '\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', -'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\007', -'u', 'r', 'l', 'P', 'a', 't', 'h', '\022', 'D', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\007', ' ', '\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', 'H', '\000', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\022', 'N', '\n', '\014', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\014', ' ', '\001', '(', '\013', '2', -')', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'F', -'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\013', 'f', 'i', 'l', 't', -'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '8', '\n', '\006', 'n', 'o', 't', '_', 'i', 'd', '\030', '\010', ' ', '\001', '(', '\013', '2', '\037', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', -'n', 'c', 'i', 'p', 'a', 'l', 'H', '\000', 'R', '\005', 'n', 'o', 't', 'I', 'd', '\032', 'm', '\n', '\003', 'S', 'e', 't', '\022', ';', '\n', -'\003', 'i', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', '\010', '\372', 'B', '\005', '\222', '\001', -'\002', '\010', '\001', 'R', '\003', 'i', 'd', 's', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', -'t', '\032', '\227', '\001', '\n', '\r', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\016', 'p', 'r', -'i', 'n', 'c', 'i', 'p', 'a', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\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', '\r', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'N', 'a', 'm', 'e', ':', '3', '\232', '\305', -'\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', -'.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'J', -'\004', '\010', '\001', '\020', '\002', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', '\021', '\n', '\n', 'i', 'd', -'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '`', '\n', '\006', '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', '9', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', '!', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', '.', 'A', 'c', 't', -'i', 'o', 'n', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', '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', 'b', 'a', 'c', '.', 'v', '3', 'B', -'\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', -'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', -'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', 'c', '/', 'v', '3', ';', 'r', -'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'O', '\n', '\014', 'u', 'r', 'i', '_', 't', 'e', 'm', 'p', 'l', 'a', 't', 'e', +'\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', +'H', '\000', 'R', '\013', 'u', 'r', 'i', 'T', 'e', 'm', 'p', 'l', 'a', 't', 'e', '\032', 's', '\n', '\003', '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', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', +'\005', '\222', '\001', '\002', '\010', '\001', 'R', '\005', 'r', 'u', 'l', 'e', 's', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', +'i', 'o', 'n', '.', 'S', 'e', 't', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'e', 'r', 'm', 'i', 's', 's', 'i', 'o', 'n', 'B', '\013', '\n', +'\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\353', '\010', '\n', '\t', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '\022', +'>', '\n', '\007', 'a', 'n', 'd', '_', 'i', 'd', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', +'S', 'e', 't', 'H', '\000', 'R', '\006', 'a', 'n', 'd', 'I', 'd', 's', '\022', '<', '\n', '\006', 'o', 'r', '_', 'i', 'd', 's', '\030', '\002', +' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', +'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'S', 'e', 't', 'H', '\000', 'R', '\005', 'o', 'r', 'I', 'd', 's', +'\022', '\033', '\n', '\003', 'a', 'n', 'y', '\030', '\003', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', +'\003', 'a', 'n', 'y', '\022', 'U', '\n', '\r', 'a', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\030', '\004', ' ', '\001', +'(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', +'.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', 'H', +'\000', 'R', '\r', 'a', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', '\022', 'K', '\n', '\t', 's', 'o', 'u', 'r', 'c', +'e', '_', 'i', 'p', '\030', '\005', ' ', '\001', '(', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', +'\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', '\022', 'K', '\n', '\020', 'd', 'i', 'r', +'e', 'c', 't', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'i', 'p', '\030', '\n', ' ', '\001', '(', '\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', 'H', '\000', 'R', '\016', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 'm', 'o', 't', 'e', 'I', 'p', '\022', '>', '\n', '\t', 'r', +'e', 'm', 'o', 't', 'e', '_', 'i', 'p', '\030', '\013', ' ', '\001', '(', '\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', 'H', '\000', 'R', +'\010', 'r', 'e', 'm', 'o', 't', 'e', 'I', 'p', '\022', '>', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\006', ' ', '\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', 'H', '\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '?', +'\n', '\010', 'u', 'r', 'l', '_', 'p', 'a', 't', 'h', '\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', +'t', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'M', 'a', 't', 'c', 'h', +'e', 'r', 'H', '\000', 'R', '\007', 'u', 'r', 'l', 'P', 'a', 't', 'h', '\022', 'D', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', +'\030', '\007', ' ', '\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', 'H', '\000', 'R', '\010', +'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'N', '\n', '\014', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', +'\014', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', +'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', +'R', '\013', 'f', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '8', '\n', '\006', 'n', 'o', 't', '_', 'i', 'd', '\030', '\010', +' ', '\001', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', +'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'H', '\000', 'R', '\005', 'n', 'o', 't', 'I', 'd', '\032', 'm', '\n', '\003', +'S', 'e', 't', '\022', ';', '\n', '\003', 'i', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'B', +'\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\003', 'i', 'd', 's', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', +'p', 'a', 'l', '.', 'S', 'e', 't', '\032', '\227', '\001', '\n', '\r', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', 'c', 'a', 't', 'e', 'd', +'\022', 'K', '\n', '\016', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\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', '\r', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 'N', 'a', +'m', 'e', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', +'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', '.', 'A', 'u', 't', 'h', 'e', 'n', 't', 'i', +'c', 'a', 't', 'e', 'd', 'J', '\004', '\010', '\001', '\020', '\002', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '2', '.', 'P', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', +'B', '\021', '\n', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '`', '\n', '\006', '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', '9', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', +'!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', +'A', 'C', '.', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', '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', 'b', +'a', 'c', '.', 'v', '3', 'B', '\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'B', 'g', 'i', 't', 'h', 'u', +'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', +'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'b', 'a', +'c', '/', 'v', '3', ';', 'r', 'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', +'o', '3', }; static _upb_DefPool_Init *deps[16] = { @@ -218,5 +222,5 @@ _upb_DefPool_Init envoy_config_rbac_v3_rbac_proto_upbdefinit = { deps, &envoy_config_rbac_v3_rbac_proto_upb_file_layout, "envoy/config/rbac/v3/rbac.proto", - UPB_STRINGVIEW_INIT(descriptor, 4221) + UPB_STRINGVIEW_INIT(descriptor, 4302) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c index ba5da3f332..ad069c6320 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.c @@ -29,7 +29,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[23013] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', +static const char descriptor[23186] = {'\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', @@ -317,7 +317,7 @@ static const char descriptor[23013] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', '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', '\"', '\305', '\005', '\n', '\n', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', +'\010', '\003', '\020', '\004', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\250', '\006', '\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', @@ -341,615 +341,622 @@ static const char descriptor[23013] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 't', 'e', '_', 'n', 'e', 't', 'w', 'o', 'r', 'k', '_', 'a', 'c', 'c', 'e', 's', 's', '\030', '\014', ' ', '\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', '\031', 'a', 'l', 'l', 'o', 'w', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'N', 'e', 't', 'w', 'o', 'r', 'k', 'A', 'c', 'c', -'e', 's', 's', ':', '$', '\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', '\"', '\334', -',', '\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', ':', '\n', '\030', 'c', 'l', -'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '%', ' ', -'\001', '(', '\t', 'H', '\000', 'R', '\026', 'c', 'l', 'u', 's', 't', 'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', -'u', 'g', 'i', 'n', '\022', 'v', '\n', '\037', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', -'e', 'c', 'i', 'f', 'i', 'e', 'r', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '\'', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', -'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 'H', '\000', 'R', '\034', 'i', 'n', 'l', 'i', -'n', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', '\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', 'Z', '\n', '\023', 'p', 'a', 't', 'h', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', -'\030', ')', ' ', '\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', '\021', 'p', 'a', 't', 'h', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\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', '5', '\n', '\027', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'x', '_', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', 'd', '_', 'h', -'o', 's', 't', '\030', '&', ' ', '\001', '(', '\010', 'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'X', 'F', 'o', 'r', 'w', 'a', 'r', 'd', -'e', 'd', 'H', 'o', 's', 't', '\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', 'V', '\n', '\021', -'e', 'a', 'r', 'l', 'y', '_', 'd', 'a', 't', 'a', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '(', ' ', '\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', 'e', 'a', 'r', 'l', 'y', 'D', -'a', 't', 'a', 'P', 'o', 'l', 'i', 'c', 'y', '\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', '\\', '\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', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', 'B', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', -'3', '.', '0', 'R', '\004', 'c', 'o', 'r', 's', '\022', 'P', '\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', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', -'R', '\016', 'm', 'a', 'x', 'G', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'V', '\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', '\013', '\030', -'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', '\200', '\001', '\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', '\013', '\030', '\001', '\222', '\307', -'\206', '\330', '\004', '\003', '3', '.', '0', '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', '_', '\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', '\013', '\030', '\001', '\222', '\307', '\206', -'\330', '\004', '\003', '3', '.', '0', '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', '\201', '\003', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', -'\022', '3', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\031', '\362', '\230', '\376', '\217', '\005', '\023', -'\022', '\021', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\007', 'c', 'l', 'u', 's', -'t', 'e', 'r', '\022', 'K', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\005', ' ', '\001', -'(', '\t', 'B', '$', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', '\362', '\230', '\376', '\217', '\005', '\023', '\022', '\021', 'c', 'l', -'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', 'H', -'e', 'a', 'd', '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', '\326', '\013', '\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', +'e', 's', 's', '\022', 'a', '\n', '\037', 'f', 'o', 'r', 'w', 'a', 'r', 'd', '_', 'n', 'o', 't', '_', 'm', 'a', 't', 'c', 'h', 'i', +'n', 'g', '_', 'p', 'r', 'e', 'f', 'l', 'i', 'g', 'h', 't', 's', '\030', '\r', ' ', '\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', '\034', 'f', +'o', 'r', 'w', 'a', 'r', 'd', 'N', 'o', 't', 'M', 'a', 't', 'c', 'h', 'i', 'n', 'g', 'P', 'r', 'e', 'f', 'l', 'i', 'g', 'h', +'t', 's', ':', '$', '\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', '\"', '\246', '-', +'\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', ':', '\n', '\030', 'c', 'l', 'u', +'s', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '%', ' ', '\001', +'(', '\t', 'H', '\000', 'R', '\026', 'c', 'l', 'u', 's', 't', 'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', +'g', 'i', 'n', '\022', 'v', '\n', '\037', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', +'c', 'i', 'f', 'i', 'e', 'r', '_', 'p', 'l', 'u', 'g', 'i', 'n', '\030', '\'', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', +'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 'H', '\000', 'R', '\034', 'i', 'n', 'l', 'i', 'n', +'e', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', '\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', 'Z', '\n', '\023', 'p', 'a', 't', 'h', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', +')', ' ', '\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', +'\021', 'p', 'a', 't', 'h', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\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', '5', '\n', '\027', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'x', '_', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', 'd', '_', 'h', 'o', +'s', 't', '\030', '&', ' ', '\001', '(', '\010', 'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'X', 'F', 'o', 'r', 'w', 'a', 'r', 'd', 'e', +'d', 'H', 'o', 's', 't', '\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', 'V', '\n', '\021', 'e', +'a', 'r', 'l', 'y', '_', 'd', 'a', 't', 'a', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '(', ' ', '\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', 'e', 'a', 'r', 'l', 'y', 'D', 'a', +'t', 'a', 'P', 'o', 'l', 'i', 'c', 'y', '\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', '\\', '\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', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', 'B', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', +'.', '0', 'R', '\004', 'c', 'o', 'r', 's', '\022', 'P', '\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', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', +'\016', 'm', 'a', 'x', 'G', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'V', '\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', '\013', '\030', '\001', +'\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', +'\200', '\001', '\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', '\013', '\030', '\001', '\222', '\307', '\206', +'\330', '\004', '\003', '3', '.', '0', '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', '_', '\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', '\013', '\030', '\001', '\222', '\307', '\206', '\330', +'\004', '\003', '3', '.', '0', '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', '\313', '\003', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', '\022', +'3', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\031', '\362', '\230', '\376', '\217', '\005', '\023', '\022', +'\021', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\007', 'c', 'l', 'u', 's', 't', +'e', 'r', '\022', 'K', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\005', ' ', '\001', '(', +'\t', 'B', '$', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', '\362', '\230', '\376', '\217', '\005', '\023', '\022', '\021', 'c', 'l', 'u', +'s', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', 'H', 'e', +'a', 'd', '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', '\022', 'H', '\n', '!', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 's', 'h', 'a', +'d', 'o', 'w', '_', 'h', 'o', 's', 't', '_', 's', 'u', 'f', 'f', 'i', 'x', '_', 'a', 'p', 'p', 'e', 'n', 'd', '\030', '\006', ' ', +'\001', '(', '\010', 'R', '\035', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'S', 'h', 'a', 'd', 'o', 'w', 'H', 'o', 's', 't', 'S', 'u', 'f', +'f', 'i', 'x', 'A', 'p', 'p', 'e', 'n', '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', '\326', '\013', '\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', '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', '_', '\n', '\017', 'C', 'o', 'o', 'k', 'i', 'e', +'A', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', '\022', '%', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\021', +'\372', 'B', '\016', 'r', '\014', '\020', '\001', '(', '\200', '\200', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\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', '\032', '\376', '\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', '\022', ']', '\n', '\n', 'a', 't', 't', 'r', +'i', 'b', 'u', 't', 'e', 's', '\030', '\004', ' ', '\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', '.', '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', '_', '\n', '\017', 'C', 'o', 'o', 'k', -'i', 'e', 'A', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', '\022', '%', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'B', '\021', '\372', 'B', '\016', 'r', '\014', '\020', '\001', '(', '\200', '\200', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', -'\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', '\032', '\376', '\001', '\n', '\006', 'C', 'o', 'o', 'k', 'i', 'e', +'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'o', 'k', 'i', 'e', 'A', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', +'R', '\n', 'a', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', 's', ':', '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', '\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', '\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', '\"', '`', +'\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', '\022', '\031', '\n', '\025', 'I', 'N', +'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'E', 'R', '_', 'E', 'R', 'R', 'O', 'R', '\020', '\002', '\"', '^', '\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', '\"', '\277', +'\020', '\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', 'J', '\n', '\024', 'p', 'e', 'r', '_', +'t', 'r', 'y', '_', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\r', ' ', '\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', 'p', 'e', 'r', 'T', 'r', 'y', 'I', 'd', 'l', 'e', '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', 'd', '\n', '\030', 'r', 'e', 't', 'r', 'y', '_', 'o', 'p', 't', +'i', 'o', 'n', 's', '_', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\030', '\014', ' ', '\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', '\026', 'r', 'e', 't', 'r', 'y', 'O', 'p', 't', +'i', 'o', 'n', 's', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\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', '+', '\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', '\022', ']', '\n', '\n', 'a', 't', -'t', 'r', 'i', 'b', 'u', 't', 'e', 's', '\030', '\004', ' ', '\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', '.', 'C', 'o', 'o', 'k', 'i', 'e', 'A', 't', 't', 'r', 'i', 'b', 'u', -'t', 'e', 'R', '\n', 'a', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', 's', ':', '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', '\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', '\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', -'\"', '`', '\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', '\022', '\031', '\n', '\025', -'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'E', 'R', '_', 'E', 'R', 'R', 'O', 'R', '\020', '\002', '\"', '^', -'\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', -'\"', '\277', '\020', '\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', 'J', '\n', '\024', 'p', 'e', -'r', '_', 't', 'r', 'y', '_', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\r', ' ', '\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', 'p', 'e', 'r', 'T', 'r', 'y', 'I', 'd', 'l', 'e', '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', 'd', '\n', '\030', 'r', 'e', 't', 'r', 'y', '_', 'o', -'p', 't', 'i', 'o', 'n', 's', '_', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\030', '\014', ' ', '\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', '\026', 'r', 'e', 't', 'r', 'y', 'O', -'p', 't', 'i', 'o', 'n', 's', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\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', +'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', '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', +'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', -'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', '\"', '\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', '\"', '\241', '\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', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', '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', '\"', '\025', '\n', '\023', 'N', 'o', 'n', 'F', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', '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', -'\"', '\311', '\034', '\n', '\t', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', ';', '\n', '\005', 's', 't', 'a', 'g', 'e', '\030', '\001', +'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', '\265', '\030', '\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', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'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', '\"', +'\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', '\"', '\241', '\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', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', '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', '\"', '\025', '\n', '\023', 'N', 'o', 'n', 'F', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', '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', '\"', '\311', +'\034', '\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', '\265', +'\030', '\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', -'.', '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', 'w', '\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', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', -'.', '0', '\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', '\022', 'q', '\n', '\025', 'm', 'a', 's', 'k', 'e', 'd', '_', 'r', 'e', 'm', 'o', 't', 'e', -'_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\n', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'.', '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', '.', 'M', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', -'H', '\000', 'R', '\023', 'm', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', '\201', -'\001', '\n', '\033', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '_', -'m', 'a', 't', 'c', 'h', '\030', '\013', ' ', '\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', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', -'c', 'h', 'H', '\000', 'R', '\030', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', -'M', 'a', 't', 'c', 'h', '\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', '\276', '\001', '\n', '\023', 'M', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', -'s', '\022', 'R', '\n', '\022', 'v', '4', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 's', 'k', '_', 'l', 'e', 'n', '\030', '\001', +'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', 'w', '\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', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', +'\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', '\022', 'q', '\n', '\025', 'm', 'a', 's', 'k', 'e', 'd', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', +'d', 'd', 'r', 'e', 's', 's', '\030', '\n', ' ', '\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', '.', 'M', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', 'H', '\000', +'R', '\023', 'm', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', '\201', '\001', '\n', +'\033', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '_', 'm', 'a', +'t', 'c', 'h', '\030', '\013', ' ', '\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', +'.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', +'H', '\000', 'R', '\030', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', +'t', 'c', 'h', '\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', '\276', '\001', '\n', '\023', 'M', 'a', 's', 'k', 'e', 'd', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', +'R', '\n', '\022', 'v', '4', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 's', 'k', '_', 'l', 'e', 'n', '\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', ' ', 'R', '\017', 'v', '4', 'P', 'r', 'e', 'f', 'i', +'x', 'M', 'a', 's', 'k', 'L', 'e', 'n', '\022', 'S', '\n', '\022', 'v', '6', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 's', +'k', '_', 'l', 'e', 'n', '\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', '\010', '\372', 'B', '\005', '*', '\003', '\030', '\200', +'\001', 'R', '\017', 'v', '6', 'P', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 's', 'k', 'L', 'e', 'n', '\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', '\263', '\002', '\n', '\020', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', +'\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\004', ' ', '\001', '(', '\t', 'R', +'\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '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', '\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', '\332', '\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', '\022', '$', '\n', +'\016', 's', 'k', 'i', 'p', '_', 'i', 'f', '_', 'a', 'b', 's', 'e', 'n', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\014', 's', 'k', +'i', 'p', 'I', 'f', 'A', 'b', 's', 'e', 'n', 't', '\"', '&', '\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', +'\032', '\227', '\002', '\n', '\030', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', +'a', 't', 'c', 'h', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\004', ' ', +'\001', '(', '\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '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', '\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', 'a', '\n', '\020', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', +'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', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'M', 'a', +'t', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\017', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', +'a', 'm', 'e', 't', 'e', 'r', 's', ':', '*', '\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', '\"', '\346', '\005', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\n', 'e', +'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', '\\', '\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', 'B', '\013', '\030', +'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', '7', '\n', '\014', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', ' ', '\001', '(', +'\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\013', +'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', '7', '\n', '\014', 's', 'u', 'f', 'f', 'i', 'x', '_', 'm', 'a', 't', +'c', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', +'3', '.', '0', 'H', '\000', 'R', '\013', 's', 'u', 'f', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', ';', '\n', '\016', 'c', 'o', 'n', +'t', 'a', 'i', 'n', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', +'\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\r', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', 'M', +'a', 't', 'c', 'h', '\022', 'I', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\r', ' ', '\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', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', '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', '\022', '@', '\n', '\035', 't', 'r', 'e', 'a', 't', '_', 'm', +'i', 's', 's', 'i', 'n', 'g', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'a', 's', '_', 'e', 'm', 'p', 't', 'y', '\030', '\016', ' ', +'\001', '(', '\010', 'R', '\031', 't', 'r', 'e', 'a', 't', 'M', 'i', 's', 's', 'i', 'n', 'g', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 's', +'E', 'm', 'p', 't', 'y', ':', '\'', '\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', '\"', '\206', '\003', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', ' ', 'R', '\017', 'v', '4', 'P', 'r', 'e', -'f', 'i', 'x', 'M', 'a', 's', 'k', 'L', 'e', 'n', '\022', 'S', '\n', '\022', 'v', '6', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', -'a', 's', 'k', '_', 'l', 'e', 'n', '\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', '\010', '\372', 'B', '\005', '*', '\003', -'\030', '\200', '\001', 'R', '\017', 'v', '6', 'P', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 's', 'k', 'L', 'e', 'n', '\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', '\263', '\002', '\n', '\020', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', -'c', 'h', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\004', ' ', '\001', '(', -'\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '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', '\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', '\332', '\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', '\022', -'$', '\n', '\016', 's', 'k', 'i', 'p', '_', 'i', 'f', '_', 'a', 'b', 's', 'e', 'n', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\014', -'s', 'k', 'i', 'p', 'I', 'f', 'A', 'b', 's', 'e', 'n', 't', '\"', '&', '\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', '\032', '\227', '\002', '\n', '\030', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'V', 'a', 'l', 'u', -'e', 'M', 'a', 't', 'c', 'h', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', -'\004', ' ', '\001', '(', '\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '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', -'\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', 'a', '\n', '\020', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', -'e', 't', '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', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', -'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\017', 'q', 'u', 'e', 'r', 'y', 'P', -'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', ':', '*', '\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', '\"', '\346', '\005', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', -'\n', 'e', 'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', '\\', '\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', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', '7', '\n', '\014', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', ' ', -'\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', -'R', '\013', 'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', '7', '\n', '\014', 's', 'u', 'f', 'f', 'i', 'x', '_', 'm', -'a', 't', 'c', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', -'\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\013', 's', 'u', 'f', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', ';', '\n', '\016', 'c', -'o', 'n', 't', 'a', 'i', 'n', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'H', '\000', 'R', '\r', 'c', 'o', 'n', 't', 'a', 'i', 'n', -'s', 'M', 'a', 't', 'c', 'h', '\022', 'I', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\r', ' ', -'\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', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', -'g', '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', '\022', '@', '\n', '\035', 't', 'r', 'e', 'a', 't', -'_', 'm', 'i', 's', 's', 'i', 'n', 'g', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'a', 's', '_', 'e', 'm', 'p', 't', 'y', '\030', -'\016', ' ', '\001', '(', '\010', 'R', '\031', 't', 'r', 'e', 'a', 't', 'M', 'i', 's', 's', 'i', 'n', 'g', 'H', 'e', 'a', 'd', 'e', 'r', -'A', 's', 'E', 'm', 'p', 't', 'y', ':', '\'', '\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', '\"', '\206', '\003', -'\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', '\022', 'K', '\n', '\030', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', -'_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'c', 'o', 'p', 'y', '\030', '\005', ' ', '\003', '(', '\t', 'B', '\022', '\372', -'B', '\017', '\222', '\001', '\014', '\030', '\001', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\025', 'r', 'e', 's', 'p', 'o', 'n', -'s', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'C', 'o', 'p', 'y', '\"', 'y', '\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', '\022', '\032', '\n', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', -'\001', '(', '\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', 'B', '\213', '\001', '\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', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', -'/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', -'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', ';', 'r', 'o', 'u', 't', 'e', 'v', '3', '\272', '\200', '\310', -'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'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', '\022', 'K', '\n', '\030', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', +'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'c', 'o', 'p', 'y', '\030', '\005', ' ', '\003', '(', '\t', 'B', '\022', '\372', 'B', '\017', +'\222', '\001', '\014', '\030', '\001', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\025', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', +'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'C', 'o', 'p', 'y', '\"', 'y', '\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', '\022', '\032', '\n', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', +'\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', 'B', '\213', '\001', '\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', +'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', +'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', +'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', ';', 'r', 'o', 'u', 't', 'e', 'v', '3', '\272', '\200', '\310', '\321', '\006', +'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[21] = { @@ -980,5 +987,5 @@ _upb_DefPool_Init envoy_config_route_v3_route_components_proto_upbdefinit = { deps, &envoy_config_route_v3_route_components_proto_upb_file_layout, "envoy/config/route/v3/route_components.proto", - UPB_STRINGVIEW_INIT(descriptor, 23013) + UPB_STRINGVIEW_INIT(descriptor, 23186) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c index dc1736c01e..75b33079d2 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.c @@ -9,37 +9,47 @@ #include "envoy/config/trace/v3/datadog.upbdefs.h" #include "envoy/config/trace/v3/datadog.upb_minitable.h" +extern _upb_DefPool_Init google_protobuf_duration_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[580] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'd', +static const char descriptor[786] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'd', 'a', 't', 'a', 'd', 'o', 'g', '.', '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', '\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', '\"', '\314', '\001', '\n', '\r', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'C', 'o', 'n', 'f', 'i', +'g', '.', 't', 'r', 'a', 'c', 'e', '.', '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', '.', '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', '\"', '[', '\n', '\023', 'D', 'a', 't', 'a', 'd', 'o', +'g', 'R', 'e', 'm', 'o', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'D', '\n', '\020', 'p', 'o', 'l', 'l', 'i', 'n', 'g', '_', +'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', 'p', 'o', 'l', 'l', 'i', 'n', 'g', +'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\"', '\235', '\002', '\n', '\r', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '4', '\n', '\021', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '*', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', '\022', '-', '\n', '\022', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\030', '\003', ' ', '\001', -'(', '\t', 'R', '\021', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', ':', '*', '\232', '\305', -'\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', -'2', '.', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\263', '\001', '\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', '\014', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', -'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', -'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', -'t', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '*', '\022', '(', 'e', -'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'd', -'a', 't', 'a', 'd', 'o', 'g', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', -'r', 'o', 't', 'o', '3', +'(', '\t', 'R', '\021', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', 'O', '\n', '\r', +'r', 'e', 'm', 'o', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'd', 'o', +'g', 'R', 'e', 'm', 'o', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\014', 'r', 'e', 'm', 'o', 't', 'e', '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', '.', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\263', '\001', '\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', '\014', 'D', 'a', 't', 'a', 'd', 'o', 'g', 'P', 'r', 'o', 't', 'o', +'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', +'/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', +'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', +'\217', '\005', '*', '\022', '(', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', +'c', 'e', 'r', 's', '.', 'd', 'a', 't', 'a', 'd', 'o', 'g', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', +'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static _upb_DefPool_Init *deps[5] = { +static _upb_DefPool_Init *deps[6] = { + &google_protobuf_duration_proto_upbdefinit, &udpa_annotations_migrate_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, @@ -51,5 +61,5 @@ _upb_DefPool_Init envoy_config_trace_v3_datadog_proto_upbdefinit = { deps, &envoy_config_trace_v3_datadog_proto_upb_file_layout, "envoy/config/trace/v3/datadog.proto", - UPB_STRINGVIEW_INIT(descriptor, 580) + UPB_STRINGVIEW_INIT(descriptor, 786) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h index 4515edd1bb..5d8bc2f4d9 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/datadog.upbdefs.h @@ -18,6 +18,11 @@ extern "C" { extern _upb_DefPool_Init envoy_config_trace_v3_datadog_proto_upbdefinit; +UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_DatadogRemoteConfig_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_config_trace_v3_datadog_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.config.trace.v3.DatadogRemoteConfig"); +} + UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_DatadogConfig_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &envoy_config_trace_v3_datadog_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "envoy.config.trace.v3.DatadogConfig"); diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c index a7df08e9c3..7d1fb5c03b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.c @@ -15,7 +15,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[622] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'd', +static const char descriptor[634] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'o', 't', '.', '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', '\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', '#', 'e', 'n', 'v', 'o', 'y', @@ -25,21 +25,22 @@ static const char descriptor[622] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c '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', '\"', '\253', '\001', '\n', '\017', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', ',', -'\n', '\007', 'l', 'i', 'b', 'r', 'a', 'r', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\022', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', -'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\007', 'l', 'i', 'b', 'r', 'a', 'r', 'y', '\022', '<', '\n', '\006', 'c', 'o', -'n', 'f', 'i', 'g', '\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', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\006', -'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', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'C', 'o', 'n', 'f', -'i', 'g', 'B', '\270', '\001', '\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', '\016', 'D', 'y', 'n', 'a', 'm', 'i', -'c', 'O', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', -'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', -'/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', -'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '-', '\022', '+', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', -'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'o', 't', '.', 'v', -'4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'o', 't', 'o', '\"', '\267', '\001', '\n', '\017', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '2', +'\n', '\007', 'l', 'i', 'b', 'r', 'a', 'r', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\030', '\030', '\001', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\007', 'l', 'i', 'b', 'r', 'a', 'r', 'y', +'\022', 'B', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\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', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', +'\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\006', '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', '.', 'D', +'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\270', '\001', '\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', '\016', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'O', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', +'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', +'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', +'/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '-', '\022', '+', +'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', +'d', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'o', 't', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', +'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[7] = { @@ -56,5 +57,5 @@ _upb_DefPool_Init envoy_config_trace_v3_dynamic_ot_proto_upbdefinit = { deps, &envoy_config_trace_v3_dynamic_ot_proto_upb_file_layout, "envoy/config/trace/v3/dynamic_ot.proto", - UPB_STRINGVIEW_INIT(descriptor, 622) + UPB_STRINGVIEW_INIT(descriptor, 634) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c index 9787086585..d105d1ebb7 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.c @@ -15,7 +15,7 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; -static const char descriptor[1702] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'o', +static const char descriptor[1780] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'o', 'p', 'e', 'n', 'c', 'e', 'n', 's', 'u', 's', '.', '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', '\'', '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', @@ -26,64 +26,67 @@ static const char descriptor[1702] = {'\n', '&', 'e', 'n', 'v', 'o', 'y', '/', ' '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', '\t', '\n', '\020', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', -'C', 'o', 'n', 'f', 'i', 'g', '\022', 'V', '\n', '\014', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', +'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\220', '\n', '\n', '\020', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', +'C', 'o', 'n', 'f', 'i', 'g', '\022', '\\', '\n', '\014', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'o', 'p', 'e', 'n', 'c', 'e', 'n', 's', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '.', 't', 'r', -'a', 'c', 'e', '.', 'v', '1', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\013', '\030', '\001', '\222', '\307', '\206', -'\330', '\004', '\003', '3', '.', '0', 'R', '\013', 't', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'C', '\n', '\027', 's', 't', -'d', 'o', 'u', 't', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\002', ' ', '\001', -'(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\025', 's', 't', 'd', 'o', 'u', 't', 'E', 'x', -'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'M', '\n', '\034', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', -'v', 'e', 'r', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', -'\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\032', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', -'e', 'r', 'E', 'x', 'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'A', '\n', '\026', 's', 't', 'a', 'c', -'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'p', 'r', 'o', 'j', 'e', 'c', 't', '_', 'i', 'd', '\030', '\004', ' ', '\001', '(', '\t', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', -'P', 'r', 'o', 'j', 'e', 'c', 't', 'I', 'd', '\022', '<', '\n', '\023', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', -'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', -'0', 'R', '\022', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'h', '\n', '\030', -'s', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', -'\r', ' ', '\001', '(', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', -'3', '.', '0', 'R', '\026', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', -'c', 'e', '\022', 'C', '\n', '\027', 'z', 'i', 'p', 'k', 'i', 'n', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', -'b', 'l', 'e', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\025', -'z', 'i', 'p', 'k', 'i', 'n', 'E', 'x', 'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', '*', '\n', '\n', -'z', 'i', 'p', 'k', 'i', 'n', '_', 'u', 'r', 'l', '\030', '\006', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', -'\003', '3', '.', '0', 'R', '\t', 'z', 'i', 'p', 'k', 'i', 'n', 'U', 'r', 'l', '\022', 'E', '\n', '\030', 'o', 'c', 'a', 'g', 'e', 'n', -'t', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\013', ' ', '\001', '(', '\010', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\026', 'o', 'c', 'a', 'g', 'e', 'n', 't', 'E', 'x', 'p', 'o', -'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', '4', '\n', '\017', 'o', 'c', 'a', 'g', 'e', 'n', 't', '_', 'a', 'd', -'d', 'r', 'e', 's', 's', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', -'\016', 'o', 'c', 'a', 'g', 'e', 'n', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', '`', '\n', '\024', 'o', 'c', 'a', 'g', 'e', 'n', -'t', '_', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\016', ' ', '\001', '(', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\022', 'o', 'c', 'a', 'g', 'e', -'n', 't', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'w', '\n', '\026', 'i', 'n', 'c', 'o', 'm', 'i', 'n', 'g', -'_', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\010', ' ', '\003', '(', '\016', '2', '4', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'O', 'p', 'e', 'n', 'C', -'e', 'n', 's', 'u', 's', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'i', 'n', 'c', 'o', 'm', 'i', 'n', 'g', 'T', 'r', 'a', -'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'w', '\n', '\026', 'o', 'u', 't', 'g', 'o', 'i', 'n', 'g', '_', 't', 'r', 'a', -'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\t', ' ', '\003', '(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', -'s', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\013', '\030', '\001', '\222', -'\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 'o', 'u', 't', 'g', 'o', 'i', 'n', 'g', 'T', 'r', 'a', 'c', 'e', 'C', 'o', -'n', 't', 'e', 'x', 't', '\"', '`', '\n', '\014', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\010', '\n', '\004', -'N', 'O', 'N', 'E', '\020', '\000', '\022', '\021', '\n', '\r', 'T', 'R', 'A', 'C', 'E', '_', 'C', 'O', 'N', 'T', 'E', 'X', 'T', '\020', '\001', -'\022', '\022', '\n', '\016', 'G', 'R', 'P', 'C', '_', 'T', 'R', 'A', 'C', 'E', '_', 'B', 'I', 'N', '\020', '\002', '\022', '\027', '\n', '\023', 'C', -'L', 'O', 'U', 'D', '_', 'T', 'R', 'A', 'C', 'E', '_', 'C', 'O', 'N', 'T', 'E', 'X', 'T', '\020', '\003', '\022', '\006', '\n', '\002', 'B', -'3', '\020', '\004', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'t', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', 'C', 'o', 'n', 'f', 'i', 'g', -'J', '\004', '\010', '\007', '\020', '\010', 'B', '\271', '\001', '\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', 'O', 'p', -'e', 'n', 'c', 'e', 'n', 's', 'u', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', -'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', -'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', -'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '-', '\022', '+', 'e', 'n', 'v', 'o', 'y', '.', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'o', 'p', 'e', 'n', 'c', 'e', 'n', -'s', 'u', 's', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', -'o', '3', +'a', 'c', 'e', '.', 'v', '1', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\021', '\030', '\001', '\222', '\307', '\206', +'\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\013', 't', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', +'\022', 'I', '\n', '\027', 's', 't', 'd', 'o', 'u', 't', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', +'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', +'\005', '\001', 'R', '\025', 's', 't', 'd', 'o', 'u', 't', 'E', 'x', 'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', +'\022', 'S', '\n', '\034', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', +'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', +'0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\032', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'E', 'x', 'p', 'o', 'r', +'t', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'G', '\n', '\026', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', +'_', 'p', 'r', 'o', 'j', 'e', 'c', 't', '_', 'i', 'd', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', +'\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\024', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'P', +'r', 'o', 'j', 'e', 'c', 't', 'I', 'd', '\022', 'B', '\n', '\023', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'a', +'d', 'd', 'r', 'e', 's', 's', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', +'\270', '\356', '\362', '\322', '\005', '\001', 'R', '\022', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', 'A', 'd', 'd', 'r', 'e', 's', +'s', '\022', 'n', '\n', '\030', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', 'e', 'r', '_', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', +'v', 'i', 'c', 'e', '\030', '\r', ' ', '\001', '(', '\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', 'B', '\021', '\030', '\001', '\222', +'\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\026', 's', 't', 'a', 'c', 'k', 'd', 'r', 'i', 'v', +'e', 'r', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'I', '\n', '\027', 'z', 'i', 'p', 'k', 'i', 'n', '_', 'e', +'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'B', '\021', '\030', '\001', +'\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\025', 'z', 'i', 'p', 'k', 'i', 'n', 'E', 'x', +'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', '0', '\n', '\n', 'z', 'i', 'p', 'k', 'i', 'n', '_', 'u', +'r', 'l', '\030', '\006', ' ', '\001', '(', '\t', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', +'\005', '\001', 'R', '\t', 'z', 'i', 'p', 'k', 'i', 'n', 'U', 'r', 'l', '\022', 'K', '\n', '\030', 'o', 'c', 'a', 'g', 'e', 'n', 't', '_', +'e', 'x', 'p', 'o', 'r', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\021', '\030', +'\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\026', 'o', 'c', 'a', 'g', 'e', 'n', 't', +'E', 'x', 'p', 'o', 'r', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', ':', '\n', '\017', 'o', 'c', 'a', 'g', 'e', 'n', +'t', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', +'3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\016', 'o', 'c', 'a', 'g', 'e', 'n', 't', 'A', 'd', 'd', 'r', 'e', 's', 's', +'\022', 'f', '\n', '\024', 'o', 'c', 'a', 'g', 'e', 'n', 't', '_', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', +'\016', ' ', '\001', '(', '\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', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', +'3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\022', 'o', 'c', 'a', 'g', 'e', 'n', 't', 'G', 'r', 'p', 'c', 'S', 'e', 'r', +'v', 'i', 'c', 'e', '\022', '}', '\n', '\026', 'i', 'n', 'c', 'o', 'm', 'i', 'n', 'g', '_', 't', 'r', 'a', 'c', 'e', '_', 'c', 'o', +'n', 't', 'e', 'x', 't', '\030', '\010', ' ', '\003', '(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', 'C', 'o', 'n', 'f', +'i', 'g', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', +'3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\024', 'i', 'n', 'c', 'o', 'm', 'i', 'n', 'g', 'T', 'r', 'a', 'c', 'e', 'C', +'o', 'n', 't', 'e', 'x', 't', '\022', '}', '\n', '\026', 'o', 'u', 't', 'g', 'o', 'i', 'n', 'g', '_', 't', 'r', 'a', 'c', 'e', '_', +'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\t', ' ', '\003', '(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', 'C', 'o', +'n', 'f', 'i', 'g', '.', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\021', '\030', '\001', '\222', '\307', '\206', '\330', +'\004', '\003', '3', '.', '0', '\270', '\356', '\362', '\322', '\005', '\001', 'R', '\024', 'o', 'u', 't', 'g', 'o', 'i', 'n', 'g', 'T', 'r', 'a', 'c', +'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\"', '`', '\n', '\014', 'T', 'r', 'a', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', +'\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\021', '\n', '\r', 'T', 'R', 'A', 'C', 'E', '_', 'C', 'O', 'N', 'T', 'E', 'X', +'T', '\020', '\001', '\022', '\022', '\n', '\016', 'G', 'R', 'P', 'C', '_', 'T', 'R', 'A', 'C', 'E', '_', 'B', 'I', 'N', '\020', '\002', '\022', '\027', +'\n', '\023', 'C', 'L', 'O', 'U', 'D', '_', 'T', 'R', 'A', 'C', 'E', '_', 'C', 'O', 'N', 'T', 'E', 'X', 'T', '\020', '\003', '\022', '\006', +'\n', '\002', 'B', '3', '\020', '\004', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'O', 'p', 'e', 'n', 'C', 'e', 'n', 's', 'u', 's', 'C', 'o', 'n', +'f', 'i', 'g', 'J', '\004', '\010', '\007', '\020', '\010', 'B', '\271', '\001', '\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', 'O', 'p', 'e', 'n', 'c', 'e', 'n', 's', 'u', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', +'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', +'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', +'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', '-', '\022', '+', 'e', 'n', 'v', 'o', +'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'o', 'p', 'e', 'n', +'c', 'e', 'n', 's', 'u', 's', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', +'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[7] = { @@ -100,5 +103,5 @@ _upb_DefPool_Init envoy_config_trace_v3_opencensus_proto_upbdefinit = { deps, &envoy_config_trace_v3_opencensus_proto_upb_file_layout, "envoy/config/trace/v3/opencensus.proto", - UPB_STRINGVIEW_INIT(descriptor, 1702) + UPB_STRINGVIEW_INIT(descriptor, 1780) }; diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c index 61ad81a946..e1bd00556b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.c @@ -15,7 +15,7 @@ extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[1073] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'z', +static const char descriptor[1086] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'z', 'i', 'p', 'k', 'i', 'n', '.', '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', '\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', @@ -25,7 +25,7 @@ static const char descriptor[1073] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', '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', '\"', '\367', '\004', '\n', '\014', 'Z', 'i', 'p', 'k', 'i', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '4', '\n', '\021', 'c', 'o', 'l', +'o', '\"', '\204', '\005', '\n', '\014', 'Z', 'i', 'p', 'k', 'i', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '4', '\n', '\021', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\020', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '6', '\n', '\022', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '\030', '\002', ' ', '\001', '(', '\t', @@ -41,23 +41,24 @@ static const char descriptor[1073] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'o', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\030', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '-', '\n', '\022', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\021', 'c', 'o', -'l', 'l', 'e', 'c', 't', 'o', 'r', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', '5', '\n', '\027', 's', 'p', 'l', 'i', 't', '_', -'s', 'p', 'a', 'n', 's', '_', 'f', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\024', -'s', 'p', 'l', 'i', 't', 'S', 'p', 'a', 'n', 's', 'F', 'o', 'r', 'R', 'e', 'q', 'u', 'e', 's', 't', '\"', 'x', '\n', '\030', 'C', -'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\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', '\r', '\n', '\t', 'H', 'T', 'T', 'P', '_', 'J', 'S', 'O', 'N', '\020', '\001', '\022', '\016', '\n', '\n', 'H', 'T', 'T', 'P', '_', -'P', 'R', 'O', 'T', 'O', '\020', '\002', '\022', '\010', '\n', '\004', 'G', 'R', 'P', 'C', '\020', '\003', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', -'\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'Z', 'i', -'p', 'k', 'i', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\261', '\001', '\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', '\013', 'Z', 'i', 'p', 'k', 'i', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', -'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', -'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', -'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', '\376', '\217', '\005', ')', '\022', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'c', 'e', 'r', 's', '.', 'z', 'i', 'p', 'k', 'i', 'n', '.', -'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'l', 'l', 'e', 'c', 't', 'o', 'r', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', 'B', '\n', '\027', 's', 'p', 'l', 'i', 't', '_', +'s', 'p', 'a', 'n', 's', '_', 'f', 'o', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\007', ' ', '\001', '(', '\010', 'B', '\013', +'\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', 'R', '\024', 's', 'p', 'l', 'i', 't', 'S', 'p', 'a', 'n', 's', 'F', 'o', +'r', 'R', 'e', 'q', 'u', 'e', 's', 't', '\"', 'x', '\n', '\030', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'o', 'r', 'E', 'n', 'd', 'p', +'o', 'i', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\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', '\r', '\n', '\t', 'H', 'T', 'T', 'P', '_', 'J', 'S', +'O', 'N', '\020', '\001', '\022', '\016', '\n', '\n', 'H', 'T', 'T', 'P', '_', 'P', 'R', 'O', 'T', 'O', '\020', '\002', '\022', '\010', '\n', '\004', 'G', +'R', 'P', 'C', '\020', '\003', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'Z', 'i', 'p', 'k', 'i', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\261', +'\001', '\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', '\013', 'Z', 'i', 'p', 'k', 'i', 'n', 'P', 'r', 'o', 't', +'o', 'P', '\001', 'Z', 'D', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', +'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', +'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', ';', 't', 'r', 'a', 'c', 'e', 'v', '3', '\362', '\230', +'\376', '\217', '\005', ')', '\022', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', +'a', 'c', 'e', 'r', 's', '.', 'z', 'i', 'p', 'k', 'i', 'n', '.', 'v', '4', 'a', 'l', 'p', 'h', 'a', '\272', '\200', '\310', '\321', '\006', +'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[7] = { @@ -74,5 +75,5 @@ _upb_DefPool_Init envoy_config_trace_v3_zipkin_proto_upbdefinit = { deps, &envoy_config_trace_v3_zipkin_proto_upb_file_layout, "envoy/config/trace/v3/zipkin.proto", - UPB_STRINGVIEW_INIT(descriptor, 1073) + UPB_STRINGVIEW_INIT(descriptor, 1086) }; diff --git a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c index 79783887b8..afb001724b 100644 --- a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.c @@ -19,7 +19,7 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[9023] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', +static const char descriptor[9079] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', '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', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', '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', @@ -179,7 +179,7 @@ static const char descriptor[9023] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', '(', '\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', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', -'C', 'o', 'm', 'm', 'o', 'n', '\"', '\351', '\r', '\n', '\r', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', +'C', 'o', 'm', 'm', 'o', 'n', '\"', '\241', '\016', '\n', '\r', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', '8', '\n', '\030', 'f', 'a', 'i', 'l', 'e', 'd', '_', 'l', 'o', 'c', 'a', 'l', '_', 'h', 'e', 'a', 'l', 't', 'h', 'c', 'h', 'e', 'c', 'k', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\026', 'f', 'a', 'i', 'l', 'e', 'd', 'L', 'o', 'c', 'a', 'l', 'H', 'e', 'a', 'l', 't', 'h', 'c', 'h', 'e', 'c', 'k', '\022', '.', '\n', '\023', 'n', 'o', '_', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'u', 'p', 's', @@ -239,147 +239,150 @@ static const char descriptor[9023] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'r', 'l', 'o', 'a', 'd', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', '\032', ' ', '\001', '(', '\010', 'R', '\017', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', '4', '\n', '\026', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\033', ' ', '\001', '(', '\010', 'R', '\024', 'd', 'n', 's', 'R', -'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\032', '\325', '\001', '\n', '\014', 'U', 'n', 'a', 'u', -'t', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '\022', 'R', '\n', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', -':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', -'.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', -'e', 'd', '.', 'R', 'e', 'a', 's', 'o', 'n', 'R', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\"', '6', '\n', '\006', 'R', 'e', 'a', 's', -'o', 'n', '\022', '\026', '\n', '\022', 'R', 'E', 'A', 'S', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', -'\000', '\022', '\024', '\n', '\020', 'E', 'X', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\001', ':', '9', -'\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', -'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', 't', -'h', 'o', 'r', 'i', 'z', 'e', 'd', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', -'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', -'a', 'g', 's', '\"', '\305', '\010', '\n', '\r', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'R', '\n', '\013', -'t', 'l', 's', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', -'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'T', 'L', 'S', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\n', 't', 'l', 's', 'V', 'e', -'r', 's', 'i', 'o', 'n', '\022', 'F', '\n', '\020', 't', 'l', 's', '_', 'c', 'i', 'p', 'h', 'e', 'r', '_', 's', 'u', 'i', 't', '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', 'R', '\016', 't', 'l', 's', 'C', 'i', 'p', 'h', 'e', 'r', 'S', 'u', 'i', -'t', 'e', '\022', '(', '\n', '\020', 't', 'l', 's', '_', 's', 'n', 'i', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '\030', '\003', ' ', -'\001', '(', '\t', 'R', '\016', 't', 'l', 's', 'S', 'n', 'i', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', '\022', '~', '\n', '\034', 'l', 'o', -'c', 'a', 'l', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', -'s', '\030', '\004', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', -'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', -'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\032', 'l', 'o', 'c', 'a', -'l', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '|', '\n', -'\033', 'p', 'e', 'e', 'r', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', -'i', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', -'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', -'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'R', '\031', 'p', 'e', -'e', 'r', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '$', -'\n', '\016', 't', 'l', 's', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 'i', 'd', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\014', 't', -'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'I', 'd', '\022', '\'', '\n', '\017', 'j', 'a', '3', '_', 'f', 'i', 'n', 'g', 'e', 'r', -'p', 'r', 'i', 'n', 't', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\016', 'j', 'a', '3', 'F', 'i', 'n', 'g', 'e', 'r', 'p', 'r', 'i', -'n', 't', '\032', '\231', '\003', '\n', '\025', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', -'i', 'e', 's', '\022', 'u', '\n', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', '\030', '\001', -' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', -'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', -'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', -'l', 't', 'N', 'a', 'm', 'e', 'R', '\016', 's', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\030', '\n', -'\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\022', '\026', -'\n', '\006', 'i', 's', 's', 'u', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\006', 'i', 's', 's', 'u', 'e', 'r', '\032', '\222', '\001', -'\n', '\016', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\003', 'u', 'r', 'i', '\030', '\001', -' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'u', 'r', 'i', '\022', '\022', '\n', '\003', 'd', 'n', 's', '\030', '\002', ' ', '\001', '(', '\t', 'H', -'\000', 'R', '\003', 'd', 'n', 's', ':', 'Q', '\232', '\305', '\210', '\036', 'L', '\n', 'J', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', -'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', -'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', -'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'B', '\005', '\n', '\003', 's', 'a', 'n', ':', 'B', '\232', '\305', -'\210', '\036', '=', '\n', ';', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', -'.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', -'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', 'W', '\n', '\n', 'T', 'L', 'S', 'V', 'e', 'r', 's', -'i', 'o', 'n', '\022', '\027', '\n', '\023', 'V', 'E', 'R', 'S', 'I', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', -'D', '\020', '\000', '\022', '\t', '\n', '\005', 'T', 'L', 'S', 'v', '1', '\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', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', -'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', -'\331', '\006', '\n', '\025', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', -'\022', 'T', '\n', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\001', ' ', '\001', '(', '\016', '2', -'#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', -'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\r', 'r', 'e', -'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\026', '\n', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\030', '\002', ' ', '\001', -'(', '\t', 'R', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\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', '0', '\n', '\004', 'p', 'o', 'r', 't', '\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', '\004', 'p', 'o', 'r', 't', '\022', '\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\005', -' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\035', '\n', '\n', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '\030', -'\006', ' ', '\001', '(', '\t', 'R', '\t', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', '\022', '\030', '\n', '\007', 'r', 'e', 'f', 'e', 'r', -'e', 'r', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 'f', 'e', 'r', 'e', 'r', '\022', '#', '\n', '\r', 'f', 'o', 'r', 'w', -'a', 'r', 'd', 'e', 'd', '_', 'f', 'o', 'r', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\014', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', -'d', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', '\t', ' ', '\001', '(', '\t', 'R', -'\t', 'r', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', '\022', '#', '\n', '\r', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', '_', 'p', 'a', -'t', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\014', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'P', 'a', 't', 'h', '\022', '2', '\n', -'\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'b', 'y', 't', 'e', 's', '\030', '\013', ' ', -'\001', '(', '\004', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'B', 'y', 't', 'e', 's', '\022', -',', '\n', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'o', 'd', 'y', '_', 'b', 'y', 't', 'e', 's', '\030', '\014', ' ', '\001', -'(', '\004', 'R', '\020', 'r', 'e', 'q', 'u', 'e', 's', 't', 'B', 'o', 'd', 'y', 'B', 'y', 't', 'e', 's', '\022', 'k', '\n', '\017', 'r', -'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', 'B', '.', 'e', 'n', -'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', -'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 'q', 'u', 'e', 's', -'t', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', -'d', 'e', 'r', 's', '\022', ';', '\n', '\032', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', -'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\016', ' ', '\001', '(', '\004', 'R', '\027', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', -'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\022', 'G', '\n', ' ', 'd', 'o', 'w', 'n', 's', 't', +'e', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', '6', '\n', '\027', 'd', 'o', 'w', 'n', 's', +'t', 'r', 'e', 'a', 'm', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'r', 'e', 's', 'e', 't', '\030', '\034', ' ', '\001', '(', '\010', 'R', +'\025', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'R', 'e', 'm', 'o', 't', 'e', 'R', 'e', 's', 'e', 't', '\032', '\325', '\001', +'\n', '\014', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '\022', 'R', '\n', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\030', +'\001', ' ', '\001', '(', '\016', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', +'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '.', 'U', 'n', 'a', 'u', +'t', 'h', 'o', 'r', 'i', 'z', 'e', 'd', '.', 'R', 'e', 'a', 's', 'o', 'n', 'R', '\006', 'r', 'e', 'a', 's', 'o', 'n', '\"', '6', +'\n', '\006', 'R', 'e', 'a', 's', 'o', 'n', '\022', '\026', '\n', '\022', 'R', 'E', 'A', 'S', 'O', 'N', '_', 'U', 'N', 'S', 'P', 'E', 'C', +'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\024', '\n', '\020', 'E', 'X', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'S', 'E', 'R', 'V', 'I', +'C', 'E', '\020', '\001', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', +'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', +'.', 'U', 'n', 'a', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'e', 'd', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', +'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', 'p', +'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\"', '\305', '\010', '\n', '\r', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', +'e', 's', '\022', 'R', '\n', '\013', 't', 'l', 's', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '1', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', +'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'T', 'L', 'S', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', +'\n', 't', 'l', 's', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', 'F', '\n', '\020', 't', 'l', 's', '_', 'c', 'i', 'p', 'h', 'e', 'r', +'_', 's', 'u', 'i', 't', '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', 'R', '\016', 't', 'l', 's', 'C', 'i', 'p', +'h', 'e', 'r', 'S', 'u', 'i', 't', 'e', '\022', '(', '\n', '\020', 't', 'l', 's', '_', 's', 'n', 'i', '_', 'h', 'o', 's', 't', 'n', +'a', 'm', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\016', 't', 'l', 's', 'S', 'n', 'i', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', +'\022', '~', '\n', '\034', 'l', 'o', 'c', 'a', 'l', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', +'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', +'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', +'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', +'R', '\032', 'l', 'o', 'c', 'a', 'l', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', +'i', 'e', 's', '\022', '|', '\n', '\033', 'p', 'e', 'e', 'r', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', +'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', +'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', +'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', +'e', 's', 'R', '\031', 'p', 'e', 'e', 'r', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', +'t', 'i', 'e', 's', '\022', '$', '\n', '\016', 't', 'l', 's', '_', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 'i', 'd', '\030', '\006', ' ', +'\001', '(', '\t', 'R', '\014', 't', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'I', 'd', '\022', '\'', '\n', '\017', 'j', 'a', '3', '_', +'f', 'i', 'n', 'g', 'e', 'r', 'p', 'r', 'i', 'n', 't', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\016', 'j', 'a', '3', 'F', 'i', 'n', +'g', 'e', 'r', 'p', 'r', 'i', 'n', 't', '\032', '\231', '\003', '\n', '\025', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', +'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'u', '\n', '\020', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', +'n', 'a', 'm', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', +'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', +'.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'S', 'u', +'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'R', '\016', 's', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', +'a', 'm', 'e', '\022', '\030', '\n', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 's', 'u', 'b', +'j', 'e', 'c', 't', '\022', '\026', '\n', '\006', 'i', 's', 's', 'u', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\006', 'i', 's', 's', +'u', 'e', 'r', '\032', '\222', '\001', '\n', '\016', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', '\022', '\022', '\n', +'\003', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'u', 'r', 'i', '\022', '\022', '\n', '\003', 'd', 'n', 's', '\030', +'\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\003', 'd', 'n', 's', ':', 'Q', '\232', '\305', '\210', '\036', 'L', '\n', 'J', 'e', 'n', 'v', 'o', +'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', +'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', +'r', 't', 'i', 'e', 's', '.', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'B', '\005', '\n', '\003', 's', +'a', 'n', ':', 'B', '\232', '\305', '\210', '\036', '=', '\n', ';', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', +'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'C', +'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', 'W', '\n', '\n', 'T', +'L', 'S', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\027', '\n', '\023', 'V', 'E', 'R', 'S', 'I', 'O', 'N', '_', 'U', 'N', 'S', 'P', +'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\t', '\n', '\005', 'T', 'L', 'S', 'v', '1', '\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', '%', 'e', 'n', 'v', 'o', 'y', '.', 'd', +'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'L', 'S', 'P', 'r', 'o', 'p', 'e', +'r', 't', 'i', 'e', 's', '\"', '\331', '\006', '\n', '\025', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', +'e', 'r', 't', 'i', 'e', 's', '\022', 'T', '\n', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'e', 't', 'h', 'o', 'd', '\030', +'\001', ' ', '\001', '(', '\016', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', +'\020', '\001', 'R', '\r', 'r', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\026', '\n', '\006', 's', 'c', 'h', 'e', +'m', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\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', '0', '\n', '\004', +'p', 'o', 'r', 't', '\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', '\004', 'p', 'o', 'r', 't', '\022', '\022', '\n', '\004', +'p', 'a', 't', 'h', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\035', '\n', '\n', 'u', 's', 'e', 'r', '_', +'a', 'g', 'e', 'n', 't', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\t', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', '\022', '\030', '\n', +'\007', 'r', 'e', 'f', 'e', 'r', 'e', 'r', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 'f', 'e', 'r', 'e', 'r', '\022', '#', +'\n', '\r', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', 'd', '_', 'f', 'o', 'r', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\014', 'f', 'o', +'r', 'w', 'a', 'r', 'd', 'e', 'd', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', +'\t', ' ', '\001', '(', '\t', 'R', '\t', 'r', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', '\022', '#', '\n', '\r', 'o', 'r', 'i', 'g', 'i', +'n', 'a', 'l', '_', 'p', 'a', 't', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\014', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'P', +'a', 't', 'h', '\022', '2', '\n', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'b', 'y', +'t', 'e', 's', '\030', '\013', ' ', '\001', '(', '\004', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', +'B', 'y', 't', 'e', 's', '\022', ',', '\n', '\022', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'o', 'd', 'y', '_', 'b', 'y', 't', +'e', 's', '\030', '\014', ' ', '\001', '(', '\004', 'R', '\020', 'r', 'e', 'q', 'u', 'e', 's', 't', 'B', 'o', 'd', 'y', 'B', 'y', 't', 'e', +'s', '\022', 'k', '\n', '\017', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\r', ' ', '\003', '(', +'\013', '2', 'B', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', +'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', +'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'r', 'e', 'q', 'u', +'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', ';', '\n', '\032', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', +'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\016', ' ', '\001', '(', '\004', 'R', '\027', 'u', 'p', +'s', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\022', 'G', '\n', ' ', +'d', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', +'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', '\017', ' ', '\001', '(', '\004', 'R', '\035', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', +'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\032', 'A', '\n', '\023', 'R', 'e', +'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', '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', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', +'.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', +'q', 'u', 'e', 's', 't', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', '\240', '\006', '\n', '\026', 'H', 'T', 'T', 'P', 'R', +'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'A', '\n', '\r', 'r', 'e', 's', 'p', +'o', 'n', 's', 'e', '_', 'c', 'o', 'd', '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', 'R', '\014', 'r', 'e', 's', +'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '4', '\n', '\026', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', +'d', 'e', 'r', 's', '_', 'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', +'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'B', 'y', 't', 'e', 's', '\022', '.', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', +'_', 'b', 'o', 'd', 'y', '_', 'b', 'y', 't', 'e', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\021', 'r', 'e', 's', 'p', 'o', 'n', +'s', 'e', 'B', 'o', 'd', 'y', 'B', 'y', 't', 'e', 's', '\022', 'o', '\n', '\020', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', +'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', +'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', +'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', +'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\017', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', +'r', '\n', '\021', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', +'\013', '2', 'E', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', +'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', +'.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\020', 'r', +'e', 's', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '2', '\n', '\025', 'r', 'e', 's', 'p', 'o', 'n', +'s', 'e', '_', 'c', 'o', 'd', 'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\023', 'r', 'e', +'s', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'C', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', -'d', '\030', '\017', ' ', '\001', '(', '\004', 'R', '\035', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', -'B', 'y', 't', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\032', 'A', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', -'e', 'a', 'd', 'e', 'r', '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', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', -'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', 'q', 'u', 'e', 's', 't', 'P', -'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\"', '\240', '\006', '\n', '\026', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', -'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'A', '\n', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'c', -'o', 'd', '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', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', -'o', 'd', 'e', '\022', '4', '\n', '\026', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'b', -'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\004', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', -'r', 's', 'B', 'y', 't', 'e', 's', '\022', '.', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'b', 'o', 'd', 'y', '_', -'b', 'y', 't', 'e', 's', '\030', '\003', ' ', '\001', '(', '\004', 'R', '\021', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'B', 'o', 'd', 'y', -'B', 'y', 't', 'e', 's', '\022', 'o', '\n', '\020', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', -'\030', '\004', ' ', '\003', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', -'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', -'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', -'y', 'R', '\017', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'r', '\n', '\021', 'r', 'e', 's', -'p', 'o', 'n', 's', 'e', '_', 't', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', 'E', '.', 'e', 'n', -'v', 'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'H', 'T', 'T', -'P', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '.', 'R', 'e', 's', 'p', 'o', -'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', 'R', '\020', 'r', 'e', 's', 'p', 'o', 'n', 's', -'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', 's', '\022', '2', '\n', '\025', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 'd', -'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', -'C', 'o', 'd', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'C', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', -'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\030', '\007', ' ', '\001', '(', -'\004', 'R', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'R', 'e', 'c', -'e', 'i', 'v', 'e', 'd', '\022', '?', '\n', '\034', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 'e', 'a', 'd', 'e', -'r', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\010', ' ', '\001', '(', '\004', 'R', '\031', 'd', 'o', 'w', 'n', 's', -'t', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', 't', '\032', 'B', '\n', '\024', 'R', -'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', +'d', '\030', '\007', ' ', '\001', '(', '\004', 'R', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', +'t', 'e', 's', 'R', 'e', 'c', 'e', 'i', 'v', 'e', 'd', '\022', '?', '\n', '\034', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', +'_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'b', 'y', 't', 'e', 's', '_', 's', 'e', 'n', 't', '\030', '\010', ' ', '\001', '(', '\004', 'R', +'\031', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'H', 'e', 'a', 'd', 'e', 'r', 'B', 'y', 't', 'e', 's', 'S', 'e', 'n', +'t', '\032', 'B', '\n', '\024', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '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', '\032', 'C', '\n', '\025', 'R', 'e', +'s', 'p', 'o', 'n', 's', 'e', 'T', 'r', 'a', 'i', 'l', 'e', 'r', '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', '\032', 'C', '\n', '\025', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', -'T', 'r', 'a', 'i', 'l', 'e', 'r', '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', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', -'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'R', 'e', 's', 'p', 'o', 'n', -'s', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '*', '\313', '\002', '\n', '\r', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', -'g', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'N', 'o', 't', 'S', 'e', 't', '\020', '\000', '\022', '\030', '\n', '\024', 'T', 'c', 'p', 'U', -'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\001', '\022', '\017', '\n', '\013', 'T', 'c', 'p', -'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\002', '\022', '\024', '\n', '\020', 'T', 'c', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', -'o', 'n', 'E', 'n', 'd', '\020', '\003', '\022', '\023', '\n', '\017', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'S', 't', 'a', 'r', -'t', '\020', '\004', '\022', '\026', '\n', '\022', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', -'\020', '\005', '\022', '\021', '\n', '\r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', '\020', '\006', '\022', '\025', '\n', '\021', -'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'o', 'l', 'R', 'e', 'a', 'd', 'y', '\020', '\007', '\022', '\024', '\n', '\020', 'U', 'p', -'s', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\010', '\022', '\017', '\n', '\013', 'U', 'p', 's', 't', 'r', -'e', 'a', 'm', 'E', 'n', 'd', '\020', '\t', '\022', '+', '\n', '\'', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 'u', 'n', -'n', 'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', 'b', 'l', 'i', 's', 'h', 'e', -'d', '\020', '\n', '\022', '\036', '\n', '\032', 'U', 'd', 'p', 'T', 'u', 'n', 'n', 'e', 'l', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', -'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\013', '\022', '\017', '\n', '\013', 'U', 'd', 'p', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', -'\020', '\014', '\022', '\021', '\n', '\r', 'U', 'd', 'p', 'S', 'e', 's', 's', 'i', 'o', 'n', 'E', 'n', 'd', '\020', '\r', 'B', '\215', '\001', '\n', -'%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'd', 'a', 't', 'a', -'.', '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', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', -'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', -'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', ';', 'a', 'c', 'c', 'e', -'s', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', +'o', 'y', '.', 'd', 'a', 't', 'a', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', +'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '*', '\313', '\002', '\n', '\r', 'A', 'c', +'c', 'e', 's', 's', 'L', 'o', 'g', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'N', 'o', 't', 'S', 'e', 't', '\020', '\000', '\022', '\030', +'\n', '\024', 'T', 'c', 'p', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\001', '\022', +'\017', '\n', '\013', 'T', 'c', 'p', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\002', '\022', '\024', '\n', '\020', 'T', 'c', 'p', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 'd', '\020', '\003', '\022', '\023', '\n', '\017', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', +'a', 'm', 'S', 't', 'a', 'r', 't', '\020', '\004', '\022', '\026', '\n', '\022', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', +'r', 'i', 'o', 'd', 'i', 'c', '\020', '\005', '\022', '\021', '\n', '\r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', +'\020', '\006', '\022', '\025', '\n', '\021', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'o', 'o', 'l', 'R', 'e', 'a', 'd', 'y', '\020', '\007', +'\022', '\024', '\n', '\020', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'e', 'r', 'i', 'o', 'd', 'i', 'c', '\020', '\010', '\022', '\017', '\n', +'\013', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', '\020', '\t', '\022', '+', '\n', '\'', 'D', 'o', 'w', 'n', 's', 't', 'r', +'e', 'a', 'm', 'T', 'u', 'n', 'n', 'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', +'b', 'l', 'i', 's', 'h', 'e', 'd', '\020', '\n', '\022', '\036', '\n', '\032', 'U', 'd', 'p', 'T', 'u', 'n', 'n', 'e', 'l', 'U', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'e', 'd', '\020', '\013', '\022', '\017', '\n', '\013', 'U', 'd', 'p', 'P', 'e', +'r', 'i', 'o', 'd', 'i', 'c', '\020', '\014', '\022', '\021', '\n', '\r', 'U', 'd', 'p', 'S', 'e', 's', 's', 'i', 'o', 'n', 'E', 'n', 'd', +'\020', '\r', 'B', '\215', '\001', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', +'y', '.', 'd', 'a', 't', 'a', '.', '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', 'Z', 'J', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', +'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', +'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'd', 'a', 't', 'a', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', +'3', ';', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', +'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[11] = { @@ -400,5 +403,5 @@ _upb_DefPool_Init envoy_data_accesslog_v3_accesslog_proto_upbdefinit = { deps, &envoy_data_accesslog_v3_accesslog_proto_upb_file_layout, "envoy/data/accesslog/v3/accesslog.proto", - UPB_STRINGVIEW_INIT(descriptor, 9023) + UPB_STRINGVIEW_INIT(descriptor, 9079) }; diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c index 9f0197369f..0014dbf917 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.c @@ -15,7 +15,7 @@ extern _upb_DefPool_Init xds_type_matcher_v3_matcher_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_migrate_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; -static const char descriptor[1080] = {'\n', '0', '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[1173] = {'\n', '0', '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', 'b', 'a', 'c', '/', 'v', '3', '/', 'r', 'b', 'a', 'c', '.', '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', 'b', 'a', 'c', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', @@ -26,39 +26,42 @@ static const char descriptor[1080] = {'\n', '0', 'e', 'n', 'v', 'o', 'y', '/', ' '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', '\"', '\335', '\003', '\n', '\004', 'R', 'B', 'A', 'C', '\022', 'I', '\n', +'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\272', '\004', '\n', '\004', 'R', 'B', 'A', 'C', '\022', 'I', '\n', '\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'B', '\027', '\362', '\230', '\376', '\217', '\005', '\021', '\022', '\017', -'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\005', 'r', 'u', 'l', 'e', 's', '\022', 'W', '\n', -'\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', -'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\037', '\362', '\230', '\376', '\217', -'\005', '\021', '\022', '\017', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', -'\010', '\001', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', ']', '\n', '\014', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', -'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', -'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'B', '\036', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', -'o', 'w', '_', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\013', 's', 'h', 'a', 'd', 'o', -'w', 'R', 'u', 'l', 'e', 's', '\022', 'k', '\n', '\016', 's', 'h', 'a', 'd', 'o', 'w', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', -'\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', -'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '&', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 'o', -'w', '_', 'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', -'R', '\r', 's', 'h', 'a', 'd', 'o', 'w', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '7', '\n', '\030', 's', 'h', 'a', 'd', 'o', 'w', -'_', 'r', 'u', 'l', 'e', 's', '_', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\003', ' ', '\001', '(', '\t', 'R', -'\025', 's', 'h', 'a', 'd', 'o', 'w', 'R', 'u', 'l', 'e', 's', 'S', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', ':', ',', '\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', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', '\"', '\213', '\001', '\n', '\014', 'R', 'B', -'A', 'C', 'P', 'e', 'r', 'R', 'o', 'u', 't', 'e', '\022', '?', '\n', '\004', 'r', 'b', 'a', 'c', '\030', '\002', ' ', '\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', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'R', '\004', 'r', 'b', 'a', 'c', -':', '4', '\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', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', 'P', 'e', 'r', 'R', -'o', 'u', 't', 'e', 'J', '\004', '\010', '\001', '\020', '\002', 'B', '\237', '\001', '\n', '3', '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', 'b', 'a', 'c', '.', 'v', '3', 'B', '\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', -'t', 'o', 'P', '\001', 'Z', 'S', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', -'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'b', 'a', 'c', '/', 'v', '3', ';', 'r', 'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', -'r', 'o', 't', 'o', '3', +'r', 'u', 'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\005', 'r', 'u', 'l', 'e', 's', '\022', '*', '\n', +'\021', 'r', 'u', 'l', 'e', 's', '_', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\006', ' ', '\001', '(', '\t', 'R', +'\017', 'r', 'u', 'l', 'e', 's', 'S', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', 'W', '\n', '\007', 'm', 'a', 't', 'c', 'h', +'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', +'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\037', '\362', '\230', '\376', '\217', '\005', '\021', '\022', '\017', 'r', 'u', +'l', 'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\007', 'm', 'a', +'t', 'c', 'h', 'e', 'r', '\022', ']', '\n', '\014', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', 'e', 's', '\030', '\002', ' ', '\001', +'(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'b', 'a', 'c', '.', 'v', '3', +'.', 'R', 'B', 'A', 'C', 'B', '\036', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', +'e', 's', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\013', 's', 'h', 'a', 'd', 'o', 'w', 'R', 'u', 'l', 'e', 's', +'\022', 'k', '\n', '\016', 's', 'h', 'a', 'd', 'o', 'w', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', +'\034', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'a', 't', +'c', 'h', 'e', 'r', 'B', '&', '\362', '\230', '\376', '\217', '\005', '\030', '\022', '\026', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', 'e', +'s', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\322', '\306', '\244', '\341', '\006', '\002', '\010', '\001', 'R', '\r', 's', 'h', 'a', 'd', +'o', 'w', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '7', '\n', '\030', 's', 'h', 'a', 'd', 'o', 'w', '_', 'r', 'u', 'l', 'e', 's', +'_', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\025', 's', 'h', 'a', 'd', 'o', +'w', 'R', 'u', 'l', 'e', 's', 'S', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '/', '\n', '\024', 't', 'r', 'a', 'c', 'k', +'_', 'p', 'e', 'r', '_', 'r', 'u', 'l', 'e', '_', 's', 't', 'a', 't', 's', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\021', 't', 'r', +'a', 'c', 'k', 'P', 'e', 'r', 'R', 'u', 'l', 'e', 'S', 't', 'a', 't', 's', ':', ',', '\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', +'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', '\"', '\213', '\001', '\n', '\014', 'R', 'B', 'A', 'C', 'P', 'e', 'r', 'R', 'o', +'u', 't', 'e', '\022', '?', '\n', '\004', 'r', 'b', 'a', 'c', '\030', '\002', ' ', '\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', '.', +'r', 'b', 'a', 'c', '.', 'v', '3', '.', 'R', 'B', 'A', 'C', 'R', '\004', 'r', 'b', 'a', 'c', ':', '4', '\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', 'b', 'a', 'c', '.', 'v', '2', '.', 'R', 'B', 'A', 'C', 'P', 'e', 'r', 'R', 'o', 'u', 't', 'e', 'J', '\004', '\010', +'\001', '\020', '\002', 'B', '\237', '\001', '\n', '3', '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', 'b', 'a', 'c', '.', 'v', '3', 'B', '\t', 'R', 'b', 'a', 'c', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', 'S', 'g', +'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', +'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'b', 'a', 'c', '/', 'v', '3', +';', 'r', 'b', 'a', 'c', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[7] = { @@ -75,5 +78,5 @@ _upb_DefPool_Init envoy_extensions_filters_http_rbac_v3_rbac_proto_upbdefinit = deps, &envoy_extensions_filters_http_rbac_v3_rbac_proto_upb_file_layout, "envoy/extensions/filters/http/rbac/v3/rbac.proto", - UPB_STRINGVIEW_INIT(descriptor, 1080) + UPB_STRINGVIEW_INIT(descriptor, 1173) }; diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c index b5a197ca70..80b0d31733 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c @@ -31,7 +31,7 @@ extern _upb_DefPool_Init udpa_annotations_security_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[13438] = {'\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[13490] = {'\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', @@ -69,7 +69,7 @@ static const char descriptor[13438] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', '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', '\"', '\236', 'A', '\n', '\025', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', +'o', 't', 'o', '\"', '\322', 'A', '\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', @@ -279,296 +279,298 @@ static const char descriptor[13438] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', 'R', '\033', 't', 'y', 'p', 'e', 'd', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '5', '\n', '\027', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'x', '_', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'e', 'd', '_', 'p', 'o', 'r', 't', '\030', '3', ' ', '\001', '(', '\010', 'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'X', 'F', 'o', 'r', 'w', -'a', 'r', 'd', 'e', 'd', 'P', 'o', 'r', 't', '\022', 'h', '\n', '#', 'a', 'd', 'd', '_', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', -'o', 't', 'o', 'c', 'o', 'l', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 's', 't', 'a', 't', 'e', '\030', '5', -' ', '\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', 'a', 'd', 'd', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', -'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\032', '\302', '\005', '\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', '\022', 'J', '\n', '\023', 's', 'p', 'a', 'w', 'n', '_', 'u', 'p', 's', 't', 'r', 'e', -'a', 'm', '_', 's', 'p', 'a', 'n', '\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', '\021', 's', 'p', 'a', 'w', 'n', 'U', 'p', -'s', 't', 'r', 'e', 'a', 'm', 'S', 'p', 'a', 'n', '\"', '(', '\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', -'\347', '\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', '\022', '@', '\n', '\013', 'c', 'i', 'd', 'r', '_', 'r', 'a', 'n', 'g', 'e', 's', -'\030', '\002', ' ', '\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', '\n', 'c', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', -'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', '\032', '\345', '\001', '\n', -'\030', 'P', 'a', 't', 'h', 'N', 'o', 'r', 'm', 'a', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', -'\022', 'c', '\n', '\031', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', '_', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', -'t', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'h', -'t', 't', 'p', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', -'R', '\030', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', -'n', '\022', 'd', '\n', '\032', 'h', 't', 't', 'p', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', -'m', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', -'.', 'h', 't', 't', 'p', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', -'o', 'n', 'R', '\030', 'h', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', -'i', 'o', 'n', '\032', '\344', '\002', '\n', '\021', 'P', 'r', 'o', 'x', 'y', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'n', 'f', 'i', 'g', -'\022', '%', '\n', '\016', 'r', 'e', 'm', 'o', 'v', 'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', -'\r', 'r', 'e', 'm', 'o', 'v', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'Q', '\n', '%', 'r', 'e', 'm', 'o', 'v', 'e', '_', -'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'd', 'e', -'t', 'a', 'i', 'l', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\"', 'r', 'e', 'm', 'o', 'v', 'e', 'C', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '2', '\n', -'\025', 'r', 'e', 'm', 'o', 'v', 'e', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', 's', '\030', '\003', ' ', -'\001', '(', '\010', 'R', '\023', 'r', 'e', 'm', 'o', 'v', 'e', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 's', '\022', -'A', '\n', '\035', 's', 'e', 't', '_', 'r', 'e', 'c', 'o', 'm', 'm', 'e', 'n', 'd', 'e', 'd', '_', 'r', 'e', 's', 'p', 'o', 'n', -'s', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\032', 's', 'e', 't', 'R', 'e', 'c', 'o', 'm', 'm', 'e', -'n', 'd', 'e', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', ' ', '\n', '\013', 'u', 's', 'e', '_', 'n', -'o', 'd', 'e', '_', 'i', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\t', 'u', 's', 'e', 'N', 'o', 'd', 'e', 'I', 'd', -'\022', '.', '\n', '\022', 'l', 'i', 't', 'e', 'r', 'a', 'l', '_', 'p', 'r', 'o', 'x', 'y', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', -'\001', '(', '\t', 'H', '\000', 'R', '\020', 'l', 'i', 't', 'e', 'r', 'a', 'l', 'P', 'r', 'o', 'x', 'y', 'N', 'a', 'm', 'e', 'B', '\014', -'\n', '\n', 'p', 'r', 'o', 'x', 'y', '_', 'n', 'a', 'm', 'e', '\032', '\235', '\002', '\n', '\023', 'H', 'c', 'm', 'A', 'c', 'c', 'e', 's', -'s', 'L', 'o', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'b', '\n', '\031', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', -'_', 'f', 'l', 'u', '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', 'B', '\014', -'\372', 'B', '\t', '\252', '\001', '\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\026', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'l', -'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'C', '\n', '\037', 'f', 'l', 'u', 's', 'h', '_', 'a', 'c', 'c', 'e', -'s', 's', '_', 'l', 'o', 'g', '_', 'o', 'n', '_', 'n', 'e', 'w', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\002', ' ', '\001', -'(', '\010', 'R', '\032', 'f', 'l', 'u', 's', 'h', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'O', 'n', 'N', 'e', 'w', 'R', 'e', -'q', 'u', 'e', 's', 't', '\022', ']', '\n', ',', 'f', 'l', 'u', 's', 'h', '_', 'l', 'o', 'g', '_', 'o', 'n', '_', 't', 'u', 'n', -'n', 'e', 'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', '_', 'e', 's', 't', 'a', 'b', 'l', 'i', 's', -'h', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\'', 'f', 'l', 'u', 's', 'h', 'L', 'o', 'g', 'O', 'n', 'T', 'u', 'n', 'n', -'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', 'b', 'l', 'i', 's', 'h', 'e', 'd', -'\"', '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', '\"', '\240', '\001', '\n', '\034', 'P', 'a', 't', 'h', 'W', 'i', -'t', 'h', 'E', 's', 'c', 'a', 'p', 'e', 'd', 'S', 'l', 'a', 's', 'h', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', -'\037', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', 'T', 'A', 'T', 'I', 'O', 'N', '_', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'C', '_', -'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\022', '\n', '\016', 'K', 'E', 'E', 'P', '_', 'U', 'N', 'C', 'H', 'A', 'N', 'G', -'E', 'D', '\020', '\001', '\022', '\022', '\n', '\016', 'R', 'E', 'J', 'E', 'C', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', '\002', '\022', -'\031', '\n', '\025', 'U', 'N', 'E', 'S', 'C', 'A', 'P', 'E', '_', 'A', 'N', 'D', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', -'\003', '\022', '\030', '\n', '\024', 'U', 'N', 'E', 'S', 'C', 'A', 'P', 'E', '_', 'A', 'N', 'D', '_', 'F', 'O', 'R', 'W', 'A', 'R', 'D', -'\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', '.', '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', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', -'i', 's', 't', '\"', '\345', '\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', 'N', '\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', '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', +'a', 'r', 'd', 'e', 'd', 'P', 'o', 'r', 't', '\022', '2', '\n', '\025', 'a', 'p', 'p', 'e', 'n', 'd', '_', 'l', 'o', 'c', 'a', 'l', +'_', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '\030', '9', ' ', '\001', '(', '\010', 'R', '\023', 'a', 'p', 'p', 'e', 'n', 'd', 'L', 'o', +'c', 'a', 'l', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '\022', 'h', '\n', '#', 'a', 'd', 'd', '_', 'p', 'r', 'o', 'x', 'y', '_', +'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 's', 't', 'a', 't', 'e', +'\030', '5', ' ', '\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', 'a', 'd', 'd', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', +'o', 'l', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\032', '\302', '\005', '\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', '\022', 'J', '\n', '\023', 's', 'p', 'a', 'w', 'n', '_', 'u', 'p', 's', 't', +'r', 'e', 'a', 'm', '_', 's', 'p', 'a', 'n', '\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', '\021', 's', 'p', 'a', 'w', 'n', +'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'S', 'p', 'a', 'n', '\"', '(', '\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', '\347', '\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', '\022', '@', '\n', '\013', 'c', 'i', 'd', 'r', '_', 'r', 'a', 'n', 'g', +'e', 's', '\030', '\002', ' ', '\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', '\n', 'c', 'i', 'd', 'r', 'R', 'a', 'n', +'g', 'e', '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', -'.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', 'H', '\000', 'R', '\t', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\032', '\337', -'\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', '\333', '\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', '\225', '\005', '\n', -'\024', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', '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', '\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', '\"', -'\361', '\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', '\022', '4', '\n', '\026', 's', 'r', 'd', 's', '_', -'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\024', -'s', 'r', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', ':', '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', '\"', '\350', '\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', '\022', '\032', '\n', '\010', 'd', 'i', -'s', 'a', 'b', 'l', 'e', 'd', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', ':', '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', '\"', '\216', '\001', '\n', ' ', 'E', 'n', -'v', 'o', 'y', 'M', 'o', 'b', 'i', 'l', 'e', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', -'n', 'a', 'g', 'e', 'r', '\022', 'j', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', 'R', '.', 'e', +'.', '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', '\032', '\345', +'\001', '\n', '\030', 'P', 'a', 't', 'h', 'N', 'o', 'r', 'm', 'a', 'l', 'i', 'z', 'a', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', +'n', 's', '\022', 'c', '\n', '\031', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', '_', 't', 'r', 'a', 'n', 's', 'f', 'o', 'r', +'m', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', +'.', 'h', 't', 't', 'p', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', +'o', 'n', 'R', '\030', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'i', 'n', 'g', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', +'i', 'o', 'n', '\022', 'd', '\n', '\032', 'h', 't', 't', 'p', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 't', 'r', 'a', 'n', 's', 'f', +'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', +'p', 'e', '.', 'h', 't', 't', 'p', '.', 'v', '3', '.', 'P', 'a', 't', 'h', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', +'t', 'i', 'o', 'n', 'R', '\030', 'h', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', +'a', 't', 'i', 'o', 'n', '\032', '\344', '\002', '\n', '\021', 'P', 'r', 'o', 'x', 'y', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '%', '\n', '\016', 'r', 'e', 'm', 'o', 'v', 'e', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\001', ' ', '\001', '(', +'\010', 'R', '\r', 'r', 'e', 'm', 'o', 'v', 'e', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', 'Q', '\n', '%', 'r', 'e', 'm', 'o', 'v', +'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 't', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', +'d', 'e', 't', 'a', 'i', 'l', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\"', 'r', 'e', 'm', 'o', 'v', 'e', 'C', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', 'T', 'e', 'r', 'm', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', +'2', '\n', '\025', 'r', 'e', 'm', 'o', 'v', 'e', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', 's', '\030', +'\003', ' ', '\001', '(', '\010', 'R', '\023', 'r', 'e', 'm', 'o', 'v', 'e', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', +'s', '\022', 'A', '\n', '\035', 's', 'e', 't', '_', 'r', 'e', 'c', 'o', 'm', 'm', 'e', 'n', 'd', 'e', 'd', '_', 'r', 'e', 's', 'p', +'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\032', 's', 'e', 't', 'R', 'e', 'c', 'o', 'm', +'m', 'e', 'n', 'd', 'e', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', ' ', '\n', '\013', 'u', 's', 'e', +'_', 'n', 'o', 'd', 'e', '_', 'i', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\t', 'u', 's', 'e', 'N', 'o', 'd', 'e', +'I', 'd', '\022', '.', '\n', '\022', 'l', 'i', 't', 'e', 'r', 'a', 'l', '_', 'p', 'r', 'o', 'x', 'y', '_', 'n', 'a', 'm', 'e', '\030', +'\006', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\020', 'l', 'i', 't', 'e', 'r', 'a', 'l', 'P', 'r', 'o', 'x', 'y', 'N', 'a', 'm', 'e', +'B', '\014', '\n', '\n', 'p', 'r', 'o', 'x', 'y', '_', 'n', 'a', 'm', 'e', '\032', '\235', '\002', '\n', '\023', 'H', 'c', 'm', 'A', 'c', 'c', +'e', 's', 's', 'L', 'o', 'g', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'b', '\n', '\031', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', +'o', 'g', '_', 'f', 'l', 'u', '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', +'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '2', '\004', '\020', '\300', '\204', '=', 'R', '\026', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', +'F', 'l', 'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'C', '\n', '\037', 'f', 'l', 'u', 's', 'h', '_', 'a', 'c', +'c', 'e', 's', 's', '_', 'l', 'o', 'g', '_', 'o', 'n', '_', 'n', 'e', 'w', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\002', +' ', '\001', '(', '\010', 'R', '\032', 'f', 'l', 'u', 's', 'h', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'O', 'n', 'N', 'e', 'w', +'R', 'e', 'q', 'u', 'e', 's', 't', '\022', ']', '\n', ',', 'f', 'l', 'u', 's', 'h', '_', 'l', 'o', 'g', '_', 'o', 'n', '_', 't', +'u', 'n', 'n', 'e', 'l', '_', 's', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', '_', 'e', 's', 't', 'a', 'b', 'l', +'i', 's', 'h', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\'', 'f', 'l', 'u', 's', 'h', 'L', 'o', 'g', 'O', 'n', 'T', 'u', +'n', 'n', 'e', 'l', 'S', 'u', 'c', 'c', 'e', 's', 's', 'f', 'u', 'l', 'l', 'y', 'E', 's', 't', 'a', 'b', 'l', 'i', 's', 'h', +'e', 'd', '\"', '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', '\"', '\240', '\001', '\n', '\034', 'P', 'a', 't', 'h', +'W', 'i', 't', 'h', 'E', 's', 'c', 'a', 'p', 'e', 'd', 'S', 'l', 'a', 's', 'h', 'e', 's', 'A', 'c', 't', 'i', 'o', 'n', '\022', +'#', '\n', '\037', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', 'T', 'A', 'T', 'I', 'O', 'N', '_', 'S', 'P', 'E', 'C', 'I', 'F', 'I', +'C', '_', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\022', '\n', '\016', 'K', 'E', 'E', 'P', '_', 'U', 'N', 'C', 'H', 'A', +'N', 'G', 'E', 'D', '\020', '\001', '\022', '\022', '\n', '\016', 'R', 'E', 'J', 'E', 'C', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', '\020', +'\002', '\022', '\031', '\n', '\025', 'U', 'N', 'E', 'S', 'C', 'A', 'P', 'E', '_', 'A', 'N', 'D', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', +'T', '\020', '\003', '\022', '\030', '\n', '\024', 'U', 'N', 'E', 'S', 'C', 'A', 'P', 'E', '_', 'A', 'N', 'D', '_', 'F', 'O', 'R', 'W', 'A', +'R', 'D', '\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', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', -'n', 'a', 'g', 'e', 'r', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\357', '\001', '\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', +'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', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'s', 'L', 'i', 's', 't', '\"', '\345', '\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', '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', 'Z', '|', 'g', 'i', -'t', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', -'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', -'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'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', 'N', '\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', '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', '\337', '\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', '\333', '\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', '\225', +'\005', '\n', '\024', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', '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', '\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', '\"', '\361', '\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', '\022', '4', '\n', '\026', 's', 'r', 'd', +'s', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', +'R', '\024', 's', 'r', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', ':', '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', '\"', '\350', '\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', '\022', '\032', '\n', '\010', +'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', ':', +'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', '\"', '\216', '\001', '\n', ' ', +'E', 'n', 'v', 'o', 'y', 'M', 'o', 'b', 'i', 'l', 'e', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', 'j', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', 'R', +'.', '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', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', '\357', '\001', '\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', 'Z', '|', +'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', +'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', +'\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[23] = { @@ -601,5 +603,5 @@ _upb_DefPool_Init envoy_extensions_filters_network_http_connection_manager_v3_ht deps, &envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_upb_file_layout, "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto", - UPB_STRINGVIEW_INIT(descriptor, 13438) + UPB_STRINGVIEW_INIT(descriptor, 13490) }; diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c index 8245d7f2be..660411ac66 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c @@ -20,7 +20,7 @@ extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[4252] = {'\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[4439] = {'\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', @@ -108,7 +108,7 @@ static const char descriptor[4252] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', ' 'i', 'd', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', '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', '\"', '\244', +'\030', '\002', ' ', '\001', '(', '\t', 'R', '\017', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'N', 'a', 'm', 'e', '\"', '\306', '\002', '\n', '\025', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'o', '\n', '\010', 's', 'a', 'n', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', 'H', '.', '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', @@ -117,80 +117,87 @@ static const char descriptor[4252] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', ' '\001', ' ', '\000', 'R', '\007', 's', 'a', 'n', 'T', 'y', 'p', 'e', '\022', 'H', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\002', ' ', '\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', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\"', 'P', '\n', '\007', 'S', 'a', 'n', 'T', 'y', 'p', 'e', '\022', '\030', '\n', -'\024', 'S', 'A', 'N', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\t', -'\n', '\005', 'E', 'M', 'A', 'I', 'L', '\020', '\001', '\022', '\007', '\n', '\003', 'D', 'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'U', 'R', 'I', -'\020', '\003', '\022', '\016', '\n', '\n', 'I', 'P', '_', 'A', 'D', 'D', 'R', 'E', 'S', 'S', '\020', '\004', '\"', '\220', '\014', '\n', '\034', 'C', 'e', +'\020', '\001', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\020', '\n', '\003', 'o', 'i', 'd', '\030', '\003', ' ', '\001', '(', '\t', 'R', +'\003', 'o', 'i', 'd', '\"', '`', '\n', '\007', 'S', 'a', 'n', 'T', 'y', 'p', 'e', '\022', '\030', '\n', '\024', 'S', 'A', 'N', '_', 'T', 'Y', +'P', 'E', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\t', '\n', '\005', 'E', 'M', 'A', 'I', 'L', +'\020', '\001', '\022', '\007', '\n', '\003', 'D', 'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'U', 'R', 'I', '\020', '\003', '\022', '\016', '\n', '\n', 'I', +'P', '_', 'A', 'D', 'D', 'R', 'E', 'S', 'S', '\020', '\004', '\022', '\016', '\n', '\n', 'O', 'T', 'H', 'E', 'R', '_', 'N', 'A', 'M', 'E', +'\020', '\005', '\"', '\251', '\r', '\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', 'W', '\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', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', +'a', '_', 'c', 'e', 'r', 't', '_', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 't', 'r', 'u', 's', 't', 'e', 'd', 'C', 'a', '\022', +'\255', '\001', '\n', ' ', 'c', 'a', '_', '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', '\r', ' ', '\001', '(', '\013', '2', 'L', '.', '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', 'P', 'r', +'o', 'v', 'i', 'd', 'e', 'r', 'P', 'l', 'u', 'g', 'i', 'n', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'B', '\026', '\362', '\230', '\376', +'\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', 'e', 'r', 't', '_', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\035', 'c', 'a', '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', '\203', '\001', '\n', '\021', 's', 'y', 's', 't', 'e', 'm', '_', 'r', 'o', 'o', 't', '_', 'c', 'e', 'r', 't', 's', '\030', '\021', ' ', +'\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', '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', 'W', '\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', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', 'e', 'r', 't', '_', 's', 'o', -'u', 'r', 'c', 'e', 'R', '\t', 't', 'r', 'u', 's', 't', 'e', 'd', 'C', 'a', '\022', '\255', '\001', '\n', ' ', 'c', 'a', '_', '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', '\r', ' ', '\001', '(', '\013', '2', 'L', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', +'t', '.', 'S', 'y', 's', 't', 'e', 'm', 'R', 'o', 'o', 't', 'C', 'e', 'r', 't', 's', 'R', '\017', 's', 'y', 's', 't', 'e', 'm', +'R', 'o', 'o', 't', 'C', 'e', 'r', 't', 's', '\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', '\202', '\001', '\n', '\035', 'm', 'a', 't', 'c', 'h', '_', 't', +'y', 'p', 'e', 'd', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 's', '\030', '\017', ' ', +'\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', 'u', +'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\031', 'm', 'a', 't', 'c', +'h', 'T', 'y', 'p', 'e', 'd', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 's', '\022', 'h', '\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', 'B', '\013', '\030', '\001', '\222', '\307', '\206', '\330', +'\004', '\003', '3', '.', '0', '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', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'P', 'l', 'u', -'g', 'i', 'n', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'c', 'a', '_', 'c', -'e', 'r', 't', '_', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\035', 'c', 'a', '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', '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', '\202', '\001', '\n', '\035', -'m', 'a', 't', 'c', 'h', '_', 't', 'y', 'p', 'e', 'd', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', -'a', 'm', 'e', 's', '\030', '\017', ' ', '\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', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', -'r', 'R', '\031', 'm', 'a', 't', 'c', 'h', 'T', 'y', 'p', 'e', 'd', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', -'m', 'e', 's', '\022', 'h', '\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', 'B', -'\013', '\030', '\001', '\222', '\307', '\206', '\330', '\004', '\003', '3', '.', '0', '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', '\022', 'b', '\n', '\027', 'c', -'u', 's', 't', 'o', 'm', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\014', ' ', -'\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', '\025', 'c', -'u', 's', 't', 'o', 'm', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '8', '\n', '\031', 'o', -'n', 'l', 'y', '_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'l', 'e', 'a', 'f', '_', 'c', 'e', 'r', 't', '_', 'c', 'r', 'l', '\030', -'\016', ' ', '\001', '(', '\010', 'R', '\025', 'o', 'n', 'l', 'y', 'V', 'e', 'r', 'i', 'f', 'y', 'L', 'e', 'a', 'f', 'C', 'e', 'r', 't', -'C', 'r', 'l', '\022', 'O', '\n', '\020', 'm', 'a', 'x', '_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'd', 'e', 'p', 't', 'h', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\016', 'm', 'a', 'x', 'V', 'e', -'r', 'i', 'f', 'y', 'D', 'e', 'p', 't', 'h', '\"', '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', '\250', -'\001', '\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', 'Z', 'V', -'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', -'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', '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', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', -'o', '3', +'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', '\022', 'b', '\n', '\027', 'c', 'u', 's', 't', 'o', 'm', '_', 'v', +'a', 'l', 'i', 'd', 'a', 't', 'o', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\014', ' ', '\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', '\025', 'c', 'u', 's', 't', 'o', 'm', 'V', 'a', +'l', 'i', 'd', 'a', 't', 'o', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '8', '\n', '\031', 'o', 'n', 'l', 'y', '_', 'v', 'e', 'r', +'i', 'f', 'y', '_', 'l', 'e', 'a', 'f', '_', 'c', 'e', 'r', 't', '_', 'c', 'r', 'l', '\030', '\016', ' ', '\001', '(', '\010', 'R', '\025', +'o', 'n', 'l', 'y', 'V', 'e', 'r', 'i', 'f', 'y', 'L', 'e', 'a', 'f', 'C', 'e', 'r', 't', 'C', 'r', 'l', '\022', 'O', '\n', '\020', +'m', 'a', 'x', '_', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'd', 'e', 'p', 't', 'h', '\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', 'B', '\007', '\372', 'B', '\004', '*', '\002', '\030', 'd', 'R', '\016', 'm', 'a', 'x', 'V', 'e', 'r', 'i', 'f', 'y', 'D', 'e', 'p', +'t', 'h', '\032', '\021', '\n', '\017', 'S', 'y', 's', 't', 'e', 'm', 'R', 'o', 'o', 't', 'C', 'e', 'r', 't', 's', '\"', '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', '\250', '\001', '\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', 'Z', 'V', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', +'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', +'/', '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', 'v', '3', '\272', '\200', +'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static _upb_DefPool_Init *deps[12] = { @@ -212,5 +219,5 @@ _upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefi deps, &envoy_extensions_transport_sockets_tls_v3_common_proto_upb_file_layout, "envoy/extensions/transport_sockets/tls/v3/common.proto", - UPB_STRINGVIEW_INIT(descriptor, 4252) + UPB_STRINGVIEW_INIT(descriptor, 4439) }; diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h index 7fc6f5d793..ad7fddf34e 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h @@ -53,6 +53,11 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_Certi return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext"); } +UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_SystemRootCerts_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext.SystemRootCerts"); +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c index a20340c53c..22d52355f6 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.c @@ -10,46 +10,52 @@ #include "envoy/type/matcher/v3/string.upb_minitable.h" extern _upb_DefPool_Init envoy_type_matcher_v3_regex_proto_upbdefinit; +extern _upb_DefPool_Init xds_core_v3_extension_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; extern _upb_DefPool_Init udpa_annotations_versioning_proto_upbdefinit; extern _upb_DefPool_Init validate_validate_proto_upbdefinit; -static const char descriptor[811] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', +static const char descriptor[901] = {'\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', '\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', '\204', '\001', '\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', 'Z', 'F', -'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', -'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', -'m', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', ';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\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', '\033', 'x', 'd', 's', '/', +'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', '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', '\"', '\216', '\003', '\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', ';', '\n', '\006', 'c', +'u', 's', 't', 'o', 'm', '\030', '\010', ' ', '\001', '(', '\013', '2', '!', '.', 'x', 'd', 's', '.', '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', '\006', +'c', 'u', 's', 't', 'o', 'm', '\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', '\204', '\001', '\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', 'Z', 'F', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', +'/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', +'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', +';', 'm', 'a', 't', 'c', 'h', 'e', 'r', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', +'3', }; -static _upb_DefPool_Init *deps[5] = { +static _upb_DefPool_Init *deps[6] = { &envoy_type_matcher_v3_regex_proto_upbdefinit, + &xds_core_v3_extension_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, &validate_validate_proto_upbdefinit, @@ -60,5 +66,5 @@ _upb_DefPool_Init envoy_type_matcher_v3_string_proto_upbdefinit = { deps, &envoy_type_matcher_v3_string_proto_upb_file_layout, "envoy/type/matcher/v3/string.proto", - UPB_STRINGVIEW_INIT(descriptor, 811) + UPB_STRINGVIEW_INIT(descriptor, 901) }; diff --git a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c index 52e7e29cbc..47d0623437 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c @@ -9,7 +9,7 @@ #include "google/protobuf/descriptor.upbdefs.h" #include "google/protobuf/descriptor.upb_minitable.h" -static const char descriptor[11630] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', +static const char descriptor[12268] = {'\n', ' ', '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', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 'M', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n', '\004', 'f', 'i', 'l', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', @@ -172,7 +172,7 @@ static const char descriptor[11630] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\022', '0', '\n', '\020', 's', 'e', 'r', 'v', 'e', 'r', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\006', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\017', 's', 'e', 'r', 'v', 'e', 'r', 'S', -'t', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\"', '\227', '\t', '\n', '\013', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', +'t', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\"', '\255', '\t', '\n', '\013', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '!', '\n', '\014', 'j', 'a', 'v', 'a', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'j', 'a', 'v', 'a', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '0', '\n', '\024', 'j', 'a', 'v', 'a', '_', 'o', 'u', 't', 'e', 'r', '_', 'c', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\022', 'j', 'a', 'v', 'a', 'O', 'u', 't', 'e', 'r', @@ -219,262 +219,287 @@ static const char descriptor[11630] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', 'i', 'o', 'n', '\"', ':', '\n', '\014', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', '\022', '\t', '\n', '\005', 'S', 'P', 'E', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'C', 'O', 'D', 'E', '_', 'S', 'I', 'Z', 'E', '\020', '\002', '\022', '\020', '\n', '\014', 'L', 'I', 'T', 'E', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\003', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', -'\004', '\010', '*', '\020', '+', 'J', '\004', '\010', '&', '\020', '\'', '\"', '\364', '\003', '\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', -'t', 'i', 'o', 'n', 's', '\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 'r', 'e', -'_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 'e', 's', -'s', 'a', 'g', 'e', 'S', 'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', '_', 's', -'t', 'a', 'n', 'd', 'a', 'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 's', 's', -'o', 'r', '\030', '\002', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 'd', 'a', -'r', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c', 'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', '\n', 'd', -'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', -'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm', 'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', '\007', ' ', -'\001', '(', '\010', 'R', '\010', 'm', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', -'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', -'l', 'i', 'c', 't', 's', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', -'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', -'s', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\014', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', -'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', -'_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', -'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', -'\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\006', -'\020', '\007', 'J', '\004', '\010', '\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n', '\"', '\255', '\n', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'O', -'p', 't', 'i', 'o', 'n', 's', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '#', '.', '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', '.', 'C', 'T', 'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I', 'N', 'G', 'R', '\005', 'c', 't', 'y', 'p', 'e', '\022', '\026', -'\n', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\022', 'G', '\n', -'\006', 'j', 's', 't', 'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', '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', '.', 'J', 'S', 'T', 'y', 'p', -'e', ':', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006', 'j', 's', 't', 'y', 'p', 'e', '\022', '\031', '\n', '\004', 'l', -'a', 'z', 'y', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'l', 'a', 'z', 'y', '\022', '.', '\n', -'\017', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a', 'z', 'y', '\030', '\017', ' ', '\001', '(', '\010', ':', '\005', 'f', -'a', 'l', 's', 'e', 'R', '\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'L', 'a', 'z', 'y', '\022', '%', '\n', '\n', 'd', -'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', -'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w', 'e', 'a', 'k', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', -'f', 'a', 'l', 's', 'e', 'R', '\004', 'w', 'e', 'a', 'k', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', -'c', 't', '\030', '\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', -'a', 'c', 't', '\022', 'K', '\n', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\030', '\021', ' ', '\001', '(', '\016', '2', '-', '.', +'\004', '\010', '*', '\020', '+', 'J', '\004', '\010', '&', '\020', '\'', 'R', '\024', 'p', 'h', 'p', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', +'s', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\"', '\364', '\003', '\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', +'n', 's', '\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 'r', 'e', '_', 'f', 'o', +'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 'e', 's', 's', 'a', 'g', +'e', 'S', 'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', '_', 's', 't', 'a', 'n', +'d', 'a', 'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 's', 's', 'o', 'r', '\030', +'\002', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', 'D', +'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c', 'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm', 'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\010', +'R', '\010', 'm', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', +'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', +'t', 's', '\030', '\013', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', +'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', +'\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\014', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', +'t', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', +'t', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', +'\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', +'\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\006', '\020', '\007', 'J', +'\004', '\010', '\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n', '\"', '\235', '\r', '\n', '\014', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', +'o', 'n', 's', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '#', '.', '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', '.', +'C', 'T', 'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I', 'N', 'G', 'R', '\005', 'c', 't', 'y', 'p', 'e', '\022', '\026', '\n', '\006', 'p', +'a', 'c', 'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\022', 'G', '\n', '\006', 'j', 's', +'t', 'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', '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', '.', 'J', 'S', 'T', 'y', 'p', 'e', ':', '\t', +'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006', 'j', 's', 't', 'y', 'p', 'e', '\022', '\031', '\n', '\004', 'l', 'a', 'z', 'y', +'\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'l', 'a', 'z', 'y', '\022', '.', '\n', '\017', 'u', 'n', +'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a', 'z', 'y', '\030', '\017', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', +'e', 'R', '\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'L', 'a', 'z', 'y', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w', 'e', 'a', 'k', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', +'s', 'e', 'R', '\004', 'w', 'e', 'a', 'k', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', +'\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', +'\022', 'K', '\n', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\030', '\021', ' ', '\001', '(', '\016', '2', '-', '.', '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', +'.', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', 'R', '\t', 'r', 'e', 't', 'e', 'n', 't', 'i', +'o', 'n', '\022', 'H', '\n', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\030', '\023', ' ', '\003', '(', '\016', '2', '.', '.', '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', +'.', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', 'R', '\007', 't', 'a', 'r', 'g', 'e', 't', +'s', '\022', 'W', '\n', '\020', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\024', ' ', '\003', +'(', '\013', '2', ',', '.', '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', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\017', +'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', +'e', 's', '\030', '\025', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'U', '\n', +'\017', 'f', 'e', 'a', 't', 'u', 'r', 'e', '_', 's', 'u', 'p', 'p', 'o', 'r', 't', '\030', '\026', ' ', '\001', '(', '\013', '2', ',', '.', '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', '.', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', 'R', '\t', 'r', 'e', 't', 'e', -'n', 't', 'i', 'o', 'n', '\022', 'H', '\n', '\007', 't', 'a', 'r', 'g', 'e', 't', 's', '\030', '\023', ' ', '\003', '(', '\016', '2', '.', '.', -'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', '.', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', 'R', '\007', 't', 'a', 'r', -'g', 'e', 't', 's', '\022', 'W', '\n', '\020', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', -'\024', ' ', '\003', '(', '\013', '2', ',', '.', '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', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', -'t', 'R', '\017', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', -'t', 'u', 'r', 'e', 's', '\030', '\025', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', -'\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', -'\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', -'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\032', 'Z', '\n', '\016', 'E', 'd', 'i', 't', 'i', 'o', +'o', 'n', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', 'R', '\016', 'f', 'e', 'a', 't', 'u', +'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', +'d', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', +'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\032', +'Z', '\n', '\016', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', +'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'v', 'a', +'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\032', '\226', '\002', '\n', '\016', 'F', 'e', 'a', 't', +'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'G', '\n', '\022', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'i', 'n', 't', +'r', 'o', 'd', 'u', 'c', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\021', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'I', 'n', +'t', 'r', 'o', 'd', 'u', 'c', 'e', 'd', '\022', 'G', '\n', '\022', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'd', 'e', 'p', 'r', 'e', +'c', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\021', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', '\022', '/', '\n', '\023', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '_', 'w', 'a', 'r', +'n', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\022', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', 'W', 'a', +'r', 'n', 'i', 'n', 'g', '\022', 'A', '\n', '\017', 'e', 'd', 'i', 't', 'i', 'o', 'n', '_', 'r', 'e', 'm', 'o', 'v', 'e', 'd', '\030', +'\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', +'d', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'e', 'd', 'i', 't', 'i', 'o', 'n', 'R', 'e', 'm', 'o', 'v', 'e', 'd', '\"', '/', '\n', +'\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\000', '\022', '\010', '\n', '\004', 'C', 'O', 'R', +'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I', 'N', 'G', '_', 'P', 'I', 'E', 'C', 'E', '\020', '\002', '\"', '5', '\n', '\006', +'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', '\020', '\000', '\022', '\r', '\n', '\t', +'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'U', 'M', 'B', 'E', 'R', '\020', +'\002', '\"', 'U', '\n', '\017', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', 'n', 't', 'i', 'o', 'n', '\022', '\025', '\n', '\021', 'R', +'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\025', '\n', '\021', 'R', 'E', 'T', +'E', 'N', 'T', 'I', 'O', 'N', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\001', '\022', '\024', '\n', '\020', 'R', 'E', 'T', 'E', 'N', +'T', 'I', 'O', 'N', '_', 'S', 'O', 'U', 'R', 'C', 'E', '\020', '\002', '\"', '\214', '\002', '\n', '\020', 'O', 'p', 't', 'i', 'o', 'n', 'T', +'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', +'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', +'F', 'I', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'X', 'T', +'E', 'N', 'S', 'I', 'O', 'N', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\002', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', +'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\003', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', +'T', 'Y', 'P', 'E', '_', 'F', 'I', 'E', 'L', 'D', '\020', '\004', '\022', '\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', +'P', 'E', '_', 'O', 'N', 'E', 'O', 'F', '\020', '\005', '\022', '\024', '\n', '\020', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', +'_', 'E', 'N', 'U', 'M', '\020', '\006', '\022', '\032', '\n', '\026', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', +'U', 'M', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\007', '\022', '\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', +'_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\010', '\022', '\026', '\n', '\022', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', +'_', 'M', 'E', 'T', 'H', 'O', 'D', '\020', '\t', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', +'\005', 'J', '\004', '\010', '\022', '\020', '\023', '\"', '\254', '\001', '\n', '\014', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', +'7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', +'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', +'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', +'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', +'\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\321', '\002', '\n', '\013', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\037', +'\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', 'a', 'l', 'l', 'o', +'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', +'\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'V', '\n', '&', 'd', +'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', 'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', +'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\030', '\006', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', +'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', 'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', +'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\007', ' ', '\001', '(', +'\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', +'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', +'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', +'t', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', +'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\005', '\020', '\006', '\"', '\330', '\002', +'\n', '\020', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', +'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', +'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', +'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', +'e', 'd', 'a', 'c', 't', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', +'R', 'e', 'd', 'a', 'c', 't', '\022', 'U', '\n', '\017', 'f', 'e', 'a', 't', 'u', 'r', 'e', '_', 's', 'u', 'p', 'p', 'o', 'r', 't', +'\030', '\004', ' ', '\001', '(', '\013', '2', ',', '.', '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', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', +'r', 't', 'R', '\016', 'f', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'u', 'p', 'p', 'o', 'r', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', +'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', +'$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', +'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', +'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\325', '\001', '\n', '\016', 'S', +'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', +'\030', '\"', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '%', '\n', '\n', 'd', +'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', +'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', +'d', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', +'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', +'\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\231', '\003', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', +'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', +'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 'm', +'p', 'o', 't', 'e', 'n', 'c', 'y', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', +'s', '.', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 'P', +'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', +'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '#', ' ', '\001', '(', '\013', +'2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', +'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', +'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', +'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', +'t', 'i', 'o', 'n', '\"', 'P', '\n', '\020', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', +'\027', '\n', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', +'\023', '\n', '\017', 'N', 'O', '_', 'S', 'I', 'D', 'E', '_', 'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I', +'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'T', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003', +'\n', '\023', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004', +'n', 'a', 'm', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N', +'a', 'm', 'e', 'P', 'a', 'r', 't', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', +'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', +'r', 'V', 'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', +'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\020', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', +'u', 'e', '\022', ',', '\n', '\022', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', +'\005', ' ', '\001', '(', '\003', 'R', '\020', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!', +'\n', '\014', 'd', 'o', 'u', 'b', 'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u', +'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', +'\007', ' ', '\001', '(', '\014', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g', +'r', 'e', 'g', 'a', 't', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e', +'g', 'a', 't', 'e', 'V', 'a', 'l', 'u', 'e', '\032', 'J', '\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t', +'n', 'a', 'm', 'e', '_', 'p', 'a', 'r', 't', '\030', '\001', ' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't', +'\022', '!', '\n', '\014', 'i', 's', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i', +'s', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\247', '\n', '\n', '\n', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', +'\022', '\221', '\001', '\n', '\016', 'f', 'i', 'e', 'l', 'd', '_', 'p', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\016', +'2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', +'e', 'S', 'e', 't', '.', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', 'B', '?', '\210', '\001', '\001', '\230', '\001', +'\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\346', '\007', '\242', '\001', '\r', '\022', '\010', +'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\347', '\007', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', +'\350', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\r', 'f', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', 'l', +'\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'E', 'n', 'u', +'m', 'T', 'y', 'p', 'e', 'B', ')', '\210', '\001', '\001', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\013', '\022', '\006', 'C', 'L', 'O', 'S', +'E', 'D', '\030', '\346', '\007', '\242', '\001', '\t', '\022', '\004', 'O', 'P', 'E', 'N', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\010', +'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\230', '\001', '\n', '\027', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '_', 'f', 'i', 'e', +'l', 'd', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\016', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'R', 'e', 'p', +'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '-', '\210', '\001', '\001', '\230', '\001', +'\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', +'P', 'A', 'C', 'K', 'E', 'D', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\025', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', +'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '~', '\n', '\017', 'u', 't', 'f', '8', '_', 'v', 'a', 'l', +'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'U', 't', 'f', '8', 'V', 'a', 'l', +'i', 'd', 'a', 't', 'i', 'o', 'n', 'B', ')', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\t', '\022', '\004', 'N', 'O', +'N', 'E', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', +'R', '\016', 'u', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '~', '\n', '\020', 'm', 'e', 's', 's', 'a', +'g', 'e', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'M', 'e', 's', +'s', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', '&', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', +'\024', '\022', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\030', '\346', '\007', '\262', '\001', '\003', '\010', +'\350', '\007', 'R', '\017', 'm', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\202', '\001', '\n', '\013', 'j', +'s', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\006', ' ', '\001', '(', '\016', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'J', 's', 'o', 'n', +'F', 'o', 'r', 'm', 'a', 't', 'B', '9', '\210', '\001', '\001', '\230', '\001', '\003', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\027', '\022', '\022', +'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\030', '\346', '\007', '\242', '\001', '\n', '\022', +'\005', 'A', 'L', 'L', 'O', 'W', '\030', '\347', '\007', '\262', '\001', '\003', '\010', '\350', '\007', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', +'a', 't', '\"', '\\', '\n', '\r', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', '\032', '\n', '\026', 'F', 'I', +'E', 'L', 'D', '_', 'P', 'R', 'E', 'S', 'E', 'N', 'C', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\014', '\n', +'\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\001', '\022', '\014', '\n', '\010', 'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\002', +'\022', '\023', '\n', '\017', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\003', '\"', '7', '\n', '\010', +'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\025', '\n', '\021', 'E', 'N', 'U', 'M', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', +'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'O', 'P', 'E', 'N', '\020', '\001', '\022', '\n', '\n', '\006', 'C', 'L', 'O', 'S', 'E', +'D', '\020', '\002', '\"', 'V', '\n', '\025', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', +'i', 'n', 'g', '\022', '#', '\n', '\037', 'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '_', 'F', 'I', 'E', 'L', 'D', '_', 'E', 'N', 'C', +'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'P', 'A', 'C', 'K', 'E', 'D', +'\020', '\001', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', '\020', '\002', '\"', 'I', '\n', '\016', 'U', 't', 'f', '8', 'V', +'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'T', 'F', '8', '_', 'V', 'A', 'L', 'I', 'D', 'A', 'T', +'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\020', '\002', +'\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\003', '\"', '\004', '\010', '\001', '\020', '\001', '\"', 'S', '\n', '\017', 'M', 'e', 's', 's', 'a', +'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\034', '\n', '\030', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '_', 'E', 'N', 'C', +'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'L', 'E', 'N', 'G', 'T', 'H', +'_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'D', 'E', 'L', 'I', 'M', 'I', 'T', 'E', 'D', '\020', +'\002', '\"', 'H', '\n', '\n', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\027', '\n', '\023', 'J', 'S', 'O', 'N', '_', 'F', +'O', 'R', 'M', 'A', 'T', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\t', '\n', '\005', 'A', 'L', 'L', 'O', 'W', '\020', +'\001', '\022', '\026', '\n', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\020', '\002', +'*', '\006', '\010', '\350', '\007', '\020', '\213', 'N', '*', '\006', '\010', '\213', 'N', '\020', '\220', 'N', '*', '\006', '\010', '\220', 'N', '\020', '\221', 'N', 'J', +'\006', '\010', '\347', '\007', '\020', '\350', '\007', '\"', '\357', '\003', '\n', '\022', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', 'f', +'a', 'u', 'l', 't', 's', '\022', 'X', '\n', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '<', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', +'e', 't', 'D', 'e', 'f', 'a', 'u', 'l', 't', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', +'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', 'R', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', 'A', '\n', '\017', 'm', +'i', 'n', 'i', 'm', 'u', 'm', '_', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'i', +'n', 'i', 'm', 'u', 'm', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'e', +'d', 'i', 't', 'i', 'o', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'E', 'd', 'i', +'t', 'i', 'o', 'n', '\032', '\370', '\001', '\n', '\030', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', 'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', -'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', -'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', '/', '\n', '\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 'N', -'G', '\020', '\000', '\022', '\010', '\n', '\004', 'C', 'O', 'R', 'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I', 'N', 'G', '_', 'P', -'I', 'E', 'C', 'E', '\020', '\002', '\"', '5', '\n', '\006', 'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 'O', -'R', 'M', 'A', 'L', '\020', '\000', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', '\022', '\r', '\n', '\t', -'J', 'S', '_', 'N', 'U', 'M', 'B', 'E', 'R', '\020', '\002', '\"', 'U', '\n', '\017', 'O', 'p', 't', 'i', 'o', 'n', 'R', 'e', 't', 'e', -'n', 't', 'i', 'o', 'n', '\022', '\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', -'N', '\020', '\000', '\022', '\025', '\n', '\021', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', -'\001', '\022', '\024', '\n', '\020', 'R', 'E', 'T', 'E', 'N', 'T', 'I', 'O', 'N', '_', 'S', 'O', 'U', 'R', 'C', 'E', '\020', '\002', '\"', '\214', -'\002', '\n', '\020', 'O', 'p', 't', 'i', 'o', 'n', 'T', 'a', 'r', 'g', 'e', 't', 'T', 'y', 'p', 'e', '\022', '\027', '\n', '\023', 'T', 'A', -'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'T', 'A', -'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'T', 'A', 'R', 'G', 'E', -'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'X', 'T', 'E', 'N', 'S', 'I', 'O', 'N', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\002', '\022', -'\027', '\n', '\023', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\003', '\022', -'\025', '\n', '\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'E', 'L', 'D', '\020', '\004', '\022', '\025', '\n', -'\021', 'T', 'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'O', 'N', 'E', 'O', 'F', '\020', '\005', '\022', '\024', '\n', '\020', 'T', -'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\006', '\022', '\032', '\n', '\026', 'T', 'A', 'R', 'G', -'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\007', '\022', '\027', '\n', '\023', 'T', -'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '\020', '\010', '\022', '\026', '\n', '\022', 'T', -'A', 'R', 'G', 'E', 'T', '_', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'T', 'H', 'O', 'D', '\020', '\t', '*', '\t', '\010', '\350', '\007', '\020', -'\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\022', '\020', '\023', '\"', '\254', '\001', '\n', '\014', 'O', 'n', 'e', -'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\001', ' ', '\001', -'(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', -'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', -'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', -'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', -'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\321', '\002', '\n', '\013', 'E', 'n', 'u', -'m', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\037', '\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i', 'a', 's', '\030', '\002', -' ', '\001', '(', '\010', 'R', '\n', 'a', 'l', 'l', 'o', 'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', -'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', -'c', 'a', 't', 'e', 'd', '\022', 'V', '\n', '&', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'l', 'e', 'g', 'a', 'c', -'y', '_', 'j', 's', 'o', 'n', '_', 'f', 'i', 'e', 'l', 'd', '_', 'c', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\030', '\006', ' ', -'\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\"', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'L', 'e', 'g', 'a', 'c', 'y', -'J', 's', 'o', 'n', 'F', 'i', 'e', 'l', 'd', 'C', 'o', 'n', 'f', 'l', 'i', 'c', 't', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', -'t', 'u', 'r', 'e', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', -'\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', -'\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', -'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', -'\002', 'J', '\004', '\010', '\005', '\020', '\006', '\"', '\201', '\002', '\n', '\020', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', -'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', -'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', -'u', 'r', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', -'(', '\n', '\014', 'd', 'e', 'b', 'u', 'g', '_', 'r', 'e', 'd', 'a', 'c', 't', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', -'l', 's', 'e', 'R', '\013', 'd', 'e', 'b', 'u', 'g', 'R', 'e', 'd', 'a', 'c', 't', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', -'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', -'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', -'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\325', '\001', '\n', '\016', 'S', 'e', 'r', -'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\"', -' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', -'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', -'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', -'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', -'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', -'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', -'\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\231', '\003', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', -'s', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', -'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 'm', 'p', 'o', -'t', 'e', 'n', 'c', 'y', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', -'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', -'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', -'L', 'e', 'v', 'e', 'l', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '#', ' ', '\001', '(', '\013', '2', '\033', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', -'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', -'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', -'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', -'o', 'n', '\"', 'P', '\n', '\020', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '\027', '\n', -'\023', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', -'\017', 'N', 'O', '_', 'S', 'I', 'D', 'E', '_', 'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I', 'D', 'E', -'M', 'P', 'O', 'T', 'E', 'N', 'T', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003', '\n', '\023', -'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004', 'n', 'a', -'m', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N', 'a', 'm', -'e', 'P', 'a', 'r', 't', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', -'_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', 'V', -'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', -'e', '\030', '\004', ' ', '\001', '(', '\004', 'R', '\020', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', -'\022', ',', '\n', '\022', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', -'\001', '(', '\003', 'R', '\020', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', -'d', 'o', 'u', 'b', 'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u', 'b', 'l', -'e', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', -'\001', '(', '\014', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g', 'r', 'e', -'g', 'a', 't', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e', 'g', 'a', -'t', 'e', 'V', 'a', 'l', 'u', 'e', '\032', 'J', '\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t', 'n', 'a', -'m', 'e', '_', 'p', 'a', 'r', 't', '\030', '\001', ' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '!', -'\n', '\014', 'i', 's', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i', 's', 'E', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\214', '\n', '\n', '\n', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '\022', '\213', -'\001', '\n', '\016', 'f', 'i', 'e', 'l', 'd', '_', 'p', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', ')', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', -'e', 't', '.', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', 'B', '9', '\210', '\001', '\001', '\230', '\001', '\004', '\230', -'\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\346', '\007', '\242', '\001', '\r', '\022', '\010', 'I', 'M', -'P', 'L', 'I', 'C', 'I', 'T', '\030', '\347', '\007', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\030', '\350', '\007', -'R', '\r', 'f', 'i', 'e', 'l', 'd', 'P', 'r', 'e', 's', 'e', 'n', 'c', 'e', '\022', 'f', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', -'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', 'B', '#', '\210', -'\001', '\001', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\013', '\022', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\030', '\346', '\007', '\242', '\001', '\t', -'\022', '\004', 'O', 'P', 'E', 'N', '\030', '\347', '\007', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\222', '\001', '\n', '\027', 'r', -'e', 'p', 'e', 'a', 't', 'e', 'd', '_', 'f', 'i', 'e', 'l', 'd', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\003', ' ', -'\001', '(', '\016', '2', '1', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', -'t', 'u', 'r', 'e', 'S', 'e', 't', '.', 'R', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', -'d', 'i', 'n', 'g', 'B', '\'', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\r', '\022', '\010', 'E', 'X', 'P', 'A', 'N', -'D', 'E', 'D', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', 'P', 'A', 'C', 'K', 'E', 'D', '\030', '\347', '\007', 'R', '\025', 'r', 'e', 'p', -'e', 'a', 't', 'e', 'd', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', 'x', '\n', '\017', 'u', 't', 'f', -'8', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'U', 't', -'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'B', '#', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', -'\t', '\022', '\004', 'N', 'O', 'N', 'E', '\030', '\346', '\007', '\242', '\001', '\013', '\022', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\030', '\347', '\007', 'R', -'\016', 'u', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', 'x', '\n', '\020', 'm', 'e', 's', 's', 'a', 'g', -'e', '_', 'e', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'M', 'e', 's', 's', -'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', 'B', ' ', '\210', '\001', '\001', '\230', '\001', '\004', '\230', '\001', '\001', '\242', '\001', '\024', -'\022', '\017', 'L', 'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\030', '\346', '\007', 'R', '\017', 'm', 'e', 's', -'s', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '|', '\n', '\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', -'a', 't', '\030', '\006', ' ', '\001', '(', '\016', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', '.', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'B', '3', -'\210', '\001', '\001', '\230', '\001', '\003', '\230', '\001', '\006', '\230', '\001', '\001', '\242', '\001', '\027', '\022', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', -'E', 'S', 'T', '_', 'E', 'F', 'F', 'O', 'R', 'T', '\030', '\346', '\007', '\242', '\001', '\n', '\022', '\005', 'A', 'L', 'L', 'O', 'W', '\030', '\347', -'\007', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\"', '\\', '\n', '\r', 'F', 'i', 'e', 'l', 'd', 'P', 'r', 'e', -'s', 'e', 'n', 'c', 'e', '\022', '\032', '\n', '\026', 'F', 'I', 'E', 'L', 'D', '_', 'P', 'R', 'E', 'S', 'E', 'N', 'C', 'E', '_', 'U', -'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\001', '\022', '\014', '\n', -'\010', 'I', 'M', 'P', 'L', 'I', 'C', 'I', 'T', '\020', '\002', '\022', '\023', '\n', '\017', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'R', 'E', 'Q', -'U', 'I', 'R', 'E', 'D', '\020', '\003', '\"', '7', '\n', '\010', 'E', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', '\025', '\n', '\021', 'E', 'N', -'U', 'M', '_', 'T', 'Y', 'P', 'E', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', '\n', '\004', 'O', 'P', 'E', 'N', -'\020', '\001', '\022', '\n', '\n', '\006', 'C', 'L', 'O', 'S', 'E', 'D', '\020', '\002', '\"', 'V', '\n', '\025', 'R', 'e', 'p', 'e', 'a', 't', 'e', -'d', 'F', 'i', 'e', 'l', 'd', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '#', '\n', '\037', 'R', 'E', 'P', 'E', 'A', 'T', 'E', -'D', '_', 'F', 'I', 'E', 'L', 'D', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', -'\000', '\022', '\n', '\n', '\006', 'P', 'A', 'C', 'K', 'E', 'D', '\020', '\001', '\022', '\014', '\n', '\010', 'E', 'X', 'P', 'A', 'N', 'D', 'E', 'D', -'\020', '\002', '\"', 'C', '\n', '\016', 'U', 't', 'f', '8', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', -'T', 'F', '8', '_', 'V', 'A', 'L', 'I', 'D', 'A', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', -'\n', '\n', '\006', 'V', 'E', 'R', 'I', 'F', 'Y', '\020', '\002', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\003', '\"', 'S', '\n', '\017', -'M', 'e', 's', 's', 'a', 'g', 'e', 'E', 'n', 'c', 'o', 'd', 'i', 'n', 'g', '\022', '\034', '\n', '\030', 'M', 'E', 'S', 'S', 'A', 'G', -'E', '_', 'E', 'N', 'C', 'O', 'D', 'I', 'N', 'G', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'L', -'E', 'N', 'G', 'T', 'H', '_', 'P', 'R', 'E', 'F', 'I', 'X', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'D', 'E', 'L', 'I', 'M', -'I', 'T', 'E', 'D', '\020', '\002', '\"', 'H', '\n', '\n', 'J', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\027', '\n', '\023', 'J', -'S', 'O', 'N', '_', 'F', 'O', 'R', 'M', 'A', 'T', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\t', '\n', '\005', 'A', -'L', 'L', 'O', 'W', '\020', '\001', '\022', '\026', '\n', '\022', 'L', 'E', 'G', 'A', 'C', 'Y', '_', 'B', 'E', 'S', 'T', '_', 'E', 'F', 'F', -'O', 'R', 'T', '\020', '\002', '*', '\006', '\010', '\350', '\007', '\020', '\351', '\007', '*', '\006', '\010', '\351', '\007', '\020', '\352', '\007', '*', '\006', '\010', '\352', -'\007', '\020', '\353', '\007', '*', '\006', '\010', '\213', 'N', '\020', '\220', 'N', '*', '\006', '\010', '\220', 'N', '\020', '\221', 'N', 'J', '\006', '\010', '\347', '\007', -'\020', '\350', '\007', '\"', '\376', '\002', '\n', '\022', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', 'f', 'a', 'u', 'l', 't', -'s', '\022', 'X', '\n', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '<', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'D', 'e', -'f', 'a', 'u', 'l', 't', 's', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', -'e', 'f', 'a', 'u', 'l', 't', 'R', '\010', 'd', 'e', 'f', 'a', 'u', 'l', 't', 's', '\022', 'A', '\n', '\017', 'm', 'i', 'n', 'i', 'm', -'u', 'm', '_', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'i', 'n', 'i', 'm', 'u', -'m', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'e', 'd', 'i', 't', 'i', -'o', 'n', '\030', '\005', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\016', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'E', 'd', 'i', 't', 'i', 'o', 'n', -'\032', '\207', '\001', '\n', '\030', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'D', 'e', 'f', -'a', 'u', 'l', 't', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '\030', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'd', 'i', 't', 'i', 'o', 'n', 'R', '\007', 'e', -'d', 'i', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', -'\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', -'S', 'e', 't', 'R', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\"', '\247', '\002', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'C', -'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'D', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', -'2', '(', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', -'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', -'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', -' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's', 'p', 'a', 'n', '\030', '\002', ' ', -'\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 's', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', -'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'C', 'o', -'m', 'm', 'e', 'n', 't', 's', '\022', '+', '\n', '\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', -'t', 's', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', -'s', '\022', ':', '\n', '\031', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h', 'e', 'd', '_', 'c', 'o', 'm', -'m', 'e', 'n', 't', 's', '\030', '\006', ' ', '\003', '(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'D', 'e', 't', 'a', 'c', -'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\"', '\320', '\002', '\n', '\021', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', -'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', -'\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', -'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', -'R', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\032', '\353', '\001', '\n', '\n', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', -'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', -'h', '\022', '\037', '\n', '\013', 's', 'o', 'u', 'r', 'c', 'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 's', -'o', 'u', 'r', 'c', 'e', 'F', 'i', 'l', 'e', '\022', '\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\005', 'R', -'\005', 'b', 'e', 'g', 'i', 'n', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\022', -'R', '\n', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\030', '\005', ' ', '\001', '(', '\016', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', -'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', '\010', -'s', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', -'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n', '\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', -'*', '\222', '\002', '\n', '\007', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', -'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', -'2', '\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', -'\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', -'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '4', '\020', '\351', '\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', -'1', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', -'2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', -'9', '9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', -'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', -'\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', -'L', 'Y', '\020', '\237', '\215', '\006', '\022', '\023', '\n', '\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', -'\377', '\007', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', -'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', -'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', -'c', 't', 'i', 'o', 'n', +'n', 'R', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\022', 'N', '\n', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'a', 'b', 'l', 'e', +'_', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\023', 'o', 'v', 'e', 'r', +'r', 'i', 'd', 'a', 'b', 'l', 'e', 'F', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'B', '\n', '\016', 'f', 'i', 'x', 'e', 'd', '_', +'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'S', 'e', 't', 'R', '\r', 'f', 'i', 'x', 'e', 'd', +'F', 'e', 'a', 't', 'u', 'r', 'e', 's', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\010', 'f', 'e', 'a', +'t', 'u', 'r', 'e', 's', '\"', '\247', '\002', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', +'D', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '(', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', +'.', 'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L', +'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', +'R', '\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's', 'p', 'a', 'n', '\030', '\002', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', +'\004', 's', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', +'\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', '+', +'\n', '\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\004', ' ', '\001', '(', '\t', +'R', '\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', ':', '\n', '\031', 'l', 'e', 'a', +'d', 'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h', 'e', 'd', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\006', ' ', +'\003', '(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'D', 'e', 't', 'a', 'c', 'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e', +'n', 't', 's', '\"', '\320', '\002', '\n', '\021', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', +'\022', 'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', +'d', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'a', 'n', 'n', 'o', 't', 'a', +'t', 'i', 'o', 'n', '\032', '\353', '\001', '\n', '\n', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', +'t', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'u', +'r', 'c', 'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'F', 'i', 'l', +'e', '\022', '\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\005', 'b', 'e', 'g', 'i', 'n', '\022', '\020', +'\n', '\003', 'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\022', 'R', '\n', '\010', 's', 'e', 'm', 'a', 'n', +'t', 'i', 'c', '\030', '\005', ' ', '\001', '(', '\016', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', +'t', 'a', 't', 'i', 'o', 'n', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'R', '\010', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', +'\"', '(', '\n', '\010', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\007', '\n', +'\003', 'S', 'E', 'T', '\020', '\001', '\022', '\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', '*', '\247', '\002', '\n', '\007', 'E', 'd', 'i', +'t', 'i', 'o', 'n', '\022', '\023', '\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', +'\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'L', 'E', 'G', 'A', 'C', 'Y', '\020', '\204', '\007', '\022', '\023', '\n', '\016', +'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '2', '\020', '\346', '\007', '\022', '\023', '\n', '\016', 'E', 'D', 'I', 'T', +'I', 'O', 'N', '_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\347', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', +'2', '0', '2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0', '2', '4', '\020', '\351', +'\007', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', +'\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', +'\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_', 'O', +'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9', '8', '_', +'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', +'9', '9', '9', '9', '9', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', '\006', '\022', '\023', '\n', '\013', 'E', 'D', +'I', 'T', 'I', 'O', 'N', '_', 'M', 'A', 'X', '\020', '\377', '\377', '\377', '\377', '\007', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', +'P', 'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', +'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', +'t', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n', }; static _upb_DefPool_Init *deps[1] = { @@ -485,5 +510,5 @@ _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit = { deps, &google_protobuf_descriptor_proto_upb_file_layout, "google/protobuf/descriptor.proto", - UPB_STRINGVIEW_INIT(descriptor, 11630) + UPB_STRINGVIEW_INIT(descriptor, 12268) }; diff --git a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h index 3b99df4b83..9a488b575f 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h @@ -108,6 +108,11 @@ UPB_INLINE const upb_MessageDef *google_protobuf_FieldOptions_EditionDefault_get return upb_DefPool_FindMessageByName(s, "google.protobuf.FieldOptions.EditionDefault"); } +UPB_INLINE const upb_MessageDef *google_protobuf_FieldOptions_FeatureSupport_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "google.protobuf.FieldOptions.FeatureSupport"); +} + UPB_INLINE const upb_MessageDef *google_protobuf_OneofOptions_getmsgdef(upb_DefPool *s) { _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit); return upb_DefPool_FindMessageByName(s, "google.protobuf.OneofOptions"); diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc index 7db1842d5d..153eddbeec 100644 --- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc @@ -17,7 +17,9 @@ #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" #include +#include +#include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include @@ -38,17 +40,17 @@ namespace { class EndpointInfoHandshaker : public Handshaker { public: - const char* name() const override { return "endpoint_info"; } + absl::string_view name() const override { return "endpoint_info"; } - void DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) override { + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override { args->args = args->args .Set(GRPC_ARG_ENDPOINT_LOCAL_ADDRESS, - grpc_endpoint_get_local_address(args->endpoint)) + grpc_endpoint_get_local_address(args->endpoint.get())) .Set(GRPC_ARG_ENDPOINT_PEER_ADDRESS, - grpc_endpoint_get_peer(args->endpoint)); - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done, absl::OkStatus()); + grpc_endpoint_get_peer(args->endpoint.get())); + InvokeOnHandshakeDone(args, std::move(on_handshake_done), absl::OkStatus()); } void Shutdown(grpc_error_handle /*why*/) override {} diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc index 4279755cb6..66824008fd 100644 --- a/src/core/handshaker/handshaker.cc +++ b/src/core/handshaker/handshaker.cc @@ -23,38 +23,54 @@ #include #include +#include "absl/functional/any_invocable.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include #include #include #include -#include #include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/status_helper.h" +#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" #include "src/core/lib/iomgr/exec_ctx.h" +using ::grpc_event_engine::experimental::EventEngine; + namespace grpc_core { -namespace { +void Handshaker::InvokeOnHandshakeDone( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done, + absl::Status status) { + args->event_engine->Run([on_handshake_done = std::move(on_handshake_done), + status = std::move(status)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + on_handshake_done(std::move(status)); + // Destroy callback while ExecCtx is still in scope. + on_handshake_done = nullptr; + }); +} -using ::grpc_event_engine::experimental::EventEngine; +namespace { std::string HandshakerArgsString(HandshakerArgs* args) { - size_t read_buffer_length = - args->read_buffer != nullptr ? args->read_buffer->length : 0; - return absl::StrFormat( - "{endpoint=%p, args=%s, read_buffer=%p (length=%" PRIuPTR - "), exit_early=%d}", - args->endpoint, args->args.ToString(), args->read_buffer, - read_buffer_length, args->exit_early); + return absl::StrFormat("{endpoint=%p, args=%s, read_buffer.Length()=%" PRIuPTR + ", exit_early=%d}", + args->endpoint.get(), args->args.ToString(), + args->read_buffer.Length(), args->exit_early); } } // namespace @@ -66,158 +82,129 @@ HandshakeManager::HandshakeManager() void HandshakeManager::Add(RefCountedPtr handshaker) { MutexLock lock(&mu_); if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { - gpr_log( - GPR_INFO, - "handshake_manager %p: adding handshaker %s [%p] at index %" PRIuPTR, - this, handshaker->name(), handshaker.get(), handshakers_.size()); + LOG(INFO) << "handshake_manager " << this << ": adding handshaker " + << std::string(handshaker->name()) << " [" << handshaker.get() + << "] at index " << handshakers_.size(); } handshakers_.push_back(std::move(handshaker)); } -HandshakeManager::~HandshakeManager() { handshakers_.clear(); } +void HandshakeManager::DoHandshake( + OrphanablePtr endpoint, const ChannelArgs& channel_args, + Timestamp deadline, grpc_tcp_server_acceptor* acceptor, + absl::AnyInvocable)> + on_handshake_done) { + // We hold a ref until after the mutex is released, because we might + // wind up invoking on_handshake_done in another thread before we + // return from this function, and on_handshake_done might release the + // last ref to this object. + auto self = Ref(); + MutexLock lock(&mu_); + CHECK_EQ(index_, 0u); + on_handshake_done_ = std::move(on_handshake_done); + // Construct handshaker args. These will be passed through all + // handshakers and eventually be freed by the on_handshake_done callback. + args_.endpoint = std::move(endpoint); + args_.deadline = deadline; + args_.args = channel_args; + args_.event_engine = args_.args.GetObject(); + args_.acceptor = acceptor; + if (acceptor != nullptr && acceptor->external_connection && + acceptor->pending_data != nullptr) { + grpc_slice_buffer_swap(args_.read_buffer.c_slice_buffer(), + &(acceptor->pending_data->data.raw.slice_buffer)); + // TODO(vigneshbabu): For connections accepted through event engine + // listeners, the ownership of the byte buffer received is transferred to + // this callback and it is thus this callback's duty to delete it. + // Make this hack default once event engine is rolled out. + if (grpc_event_engine::experimental::grpc_is_event_engine_endpoint( + args_.endpoint.get())) { + grpc_byte_buffer_destroy(acceptor->pending_data); + } + } + // Start deadline timer, which owns a ref. + const Duration time_to_deadline = deadline - Timestamp::Now(); + deadline_timer_handle_ = + args_.event_engine->RunAfter(time_to_deadline, [self = Ref()]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + self->Shutdown(GRPC_ERROR_CREATE("Handshake timed out")); + // HandshakeManager deletion might require an active ExecCtx. + self.reset(); + }); + // Start first handshaker. + CallNextHandshakerLocked(absl::OkStatus()); +} -void HandshakeManager::Shutdown(grpc_error_handle why) { - { - MutexLock lock(&mu_); +void HandshakeManager::Shutdown(absl::Status error) { + MutexLock lock(&mu_); + if (!is_shutdown_) { + if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { + LOG(INFO) << "handshake_manager " << this + << ": Shutdown() called: " << error; + } + is_shutdown_ = true; // Shutdown the handshaker that's currently in progress, if any. - if (!is_shutdown_ && index_ > 0) { - is_shutdown_ = true; - handshakers_[index_ - 1]->Shutdown(why); + if (index_ > 0) { + if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { + LOG(INFO) << "handshake_manager " << this + << ": shutting down handshaker at index " << index_ - 1; + } + handshakers_[index_ - 1]->Shutdown(std::move(error)); } } } -// 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_handle error) { +void HandshakeManager::CallNextHandshakerLocked(absl::Status error) { if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { - gpr_log(GPR_INFO, - "handshake_manager %p: error=%s shutdown=%d index=%" PRIuPTR - ", args=%s", - this, StatusToString(error).c_str(), is_shutdown_, index_, - HandshakerArgsString(&args_).c_str()); + LOG(INFO) << "handshake_manager " << this << ": error=" << error + << " shutdown=" << is_shutdown_ << " index=" << index_ + << ", args=" << HandshakerArgsString(&args_); } CHECK(index_ <= handshakers_.size()); // If we got an error or we've been shut down or we're exiting early or // we've finished the last handshaker, invoke the on_handshake_done - // callback. Otherwise, call the next handshaker. + // callback. if (!error.ok() || is_shutdown_ || args_.exit_early || index_ == handshakers_.size()) { if (error.ok() && is_shutdown_) { error = GRPC_ERROR_CREATE("handshaker shutdown"); - // It is possible that the endpoint has already been destroyed by - // a shutdown call while this callback was sitting on the ExecCtx - // with no error. - if (args_.endpoint != nullptr) { - grpc_endpoint_destroy(args_.endpoint); - args_.endpoint = nullptr; - } - if (args_.read_buffer != nullptr) { - grpc_slice_buffer_destroy(args_.read_buffer); - gpr_free(args_.read_buffer); - args_.read_buffer = nullptr; - } - args_.args = ChannelArgs(); + args_.endpoint.reset(); } if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { - gpr_log(GPR_INFO, - "handshake_manager %p: handshaking complete -- scheduling " - "on_handshake_done with error=%s", - this, StatusToString(error).c_str()); + LOG(INFO) << "handshake_manager " << this + << ": handshaking complete -- scheduling " + "on_handshake_done with error=" + << error; } // Cancel deadline timer, since we're invoking the on_handshake_done // callback now. - event_engine_->Cancel(deadline_timer_handle_); - ExecCtx::Run(DEBUG_LOCATION, &on_handshake_done_, error); + args_.event_engine->Cancel(deadline_timer_handle_); is_shutdown_ = true; - } else { - auto handshaker = handshakers_[index_]; - if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { - gpr_log( - GPR_INFO, - "handshake_manager %p: calling handshaker %s [%p] at index %" PRIuPTR, - this, handshaker->name(), handshaker.get(), index_); - } - handshaker->DoHandshake(acceptor_, &call_next_handshaker_, &args_); - } - ++index_; - return is_shutdown_; -} - -void HandshakeManager::CallNextHandshakerFn(void* arg, - grpc_error_handle error) { - auto* mgr = static_cast(arg); - bool done; - { - MutexLock lock(&mgr->mu_); - done = mgr->CallNextHandshakerLocked(error); - } - // If we're invoked the final callback, we won't be coming back - // to this function, so we can release our reference to the - // handshake manager. - if (done) { - mgr->Unref(); + absl::StatusOr result(&args_); + if (!error.ok()) result = std::move(error); + args_.event_engine->Run([on_handshake_done = std::move(on_handshake_done_), + result = std::move(result)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + on_handshake_done(std::move(result)); + // Destroy callback while ExecCtx is still in scope. + on_handshake_done = nullptr; + }); + return; } -} - -void HandshakeManager::DoHandshake(grpc_endpoint* endpoint, - const ChannelArgs& channel_args, - Timestamp deadline, - grpc_tcp_server_acceptor* acceptor, - grpc_iomgr_cb_func on_handshake_done, - void* user_data) { - bool done; - { - MutexLock lock(&mu_); - CHECK_EQ(index_, 0u); - // Construct handshaker args. These will be passed through all - // handshakers and eventually be freed by the on_handshake_done callback. - args_.endpoint = endpoint; - args_.deadline = deadline; - args_.args = channel_args; - args_.user_data = user_data; - args_.read_buffer = - static_cast(gpr_malloc(sizeof(*args_.read_buffer))); - grpc_slice_buffer_init(args_.read_buffer); - if (acceptor != nullptr && acceptor->external_connection && - acceptor->pending_data != nullptr) { - grpc_slice_buffer_swap(args_.read_buffer, - &(acceptor->pending_data->data.raw.slice_buffer)); - // TODO(vigneshbabu): For connections accepted through event engine - // listeners, the ownership of the byte buffer received is transferred to - // this callback and it is thus this callback's duty to delete it. - // Make this hack default once event engine is rolled out. - if (grpc_event_engine::experimental::grpc_is_event_engine_endpoint( - endpoint)) { - grpc_byte_buffer_destroy(acceptor->pending_data); - } - } - // Initialize state needed for calling handshakers. - acceptor_ = acceptor; - GRPC_CLOSURE_INIT(&call_next_handshaker_, - &HandshakeManager::CallNextHandshakerFn, this, - grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_INIT(&on_handshake_done_, on_handshake_done, &args_, - grpc_schedule_on_exec_ctx); - // Start deadline timer, which owns a ref. - const Duration time_to_deadline = deadline - Timestamp::Now(); - event_engine_ = args_.args.GetObjectRef(); - deadline_timer_handle_ = - event_engine_->RunAfter(time_to_deadline, [self = Ref()]() mutable { - ApplicationCallbackExecCtx callback_exec_ctx; - ExecCtx exec_ctx; - self->Shutdown(GRPC_ERROR_CREATE("Handshake timed out")); - // HandshakeManager deletion might require an active ExecCtx. - self.reset(); - }); - // Start first handshaker, which also owns a ref. - Ref().release(); - done = CallNextHandshakerLocked(absl::OkStatus()); - } - if (done) { - Unref(); + // Call the next handshaker. + auto handshaker = handshakers_[index_]; + if (GRPC_TRACE_FLAG_ENABLED(handshaker)) { + LOG(INFO) << "handshake_manager " << this << ": calling handshaker " + << handshaker->name() << " [" << handshaker.get() << "] at index " + << index_; } + ++index_; + handshaker->DoHandshake(&args_, [self = Ref()](absl::Status error) mutable { + MutexLock lock(&self->mu_); + self->CallNextHandshakerLocked(std::move(error)); + }); } } // namespace grpc_core diff --git a/src/core/handshaker/handshaker.h b/src/core/handshaker/handshaker.h index f5df382408..04beed4a96 100644 --- a/src/core/handshaker/handshaker.h +++ b/src/core/handshaker/handshaker.h @@ -31,6 +31,7 @@ #include #include "src/core/lib/channel/channel_args.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/gprpp/sync.h" @@ -39,6 +40,7 @@ #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/lib/slice/slice_buffer.h" namespace grpc_core { @@ -49,34 +51,35 @@ namespace grpc_core { /// /// In general, handshakers should be used via a handshake manager. -/// Arguments passed through handshakers and to the on_handshake_done callback. +/// Arguments passed through handshakers and back to the caller. /// /// For handshakers, all members are input/output parameters; for /// example, a handshaker may read from or write to \a endpoint and /// then later replace it with a wrapped endpoint. Similarly, a /// handshaker may modify \a args. /// -/// A handshaker takes ownership of the members while a handshake is in -/// progress. Upon failure or shutdown of an in-progress handshaker, -/// the handshaker is responsible for destroying the members and setting -/// them to NULL before invoking the on_handshake_done callback. -/// -/// For the on_handshake_done callback, all members are input arguments, -/// which the callback takes ownership of. +/// A handshaker takes ownership of the members when this struct is +/// passed to DoHandshake(). It passes ownership back to the caller +/// when it invokes on_handshake_done. struct HandshakerArgs { - grpc_endpoint* endpoint = nullptr; + OrphanablePtr endpoint; ChannelArgs args; - grpc_slice_buffer* read_buffer = nullptr; + // Any bytes read from the endpoint that are not consumed by the + // handshaker must be passed back via this buffer. + SliceBuffer read_buffer; // A handshaker may set this to true before invoking on_handshake_done // to indicate that subsequent handshakers should be skipped. bool exit_early = false; - // User data passed through the handshake manager. Not used by - // individual handshakers. - void* user_data = nullptr; + // EventEngine to use for async work. + // (This is just a convenience to avoid digging it out of args.) + grpc_event_engine::experimental::EventEngine* event_engine = nullptr; // Deadline associated with the handshake. // TODO(anramach): Move this out of handshake args after EventEngine // is the default. Timestamp deadline; + // TODO(roth): Make this go away somehow as part of the EventEngine + // migration? + grpc_tcp_server_acceptor* acceptor = nullptr; }; /// @@ -86,11 +89,23 @@ struct HandshakerArgs { class Handshaker : public RefCounted { public: ~Handshaker() override = default; - virtual void Shutdown(grpc_error_handle why) = 0; - virtual void DoHandshake(grpc_tcp_server_acceptor* acceptor, - grpc_closure* on_handshake_done, - HandshakerArgs* args) = 0; - virtual const char* name() const = 0; + virtual absl::string_view name() const = 0; + virtual void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) = 0; + virtual void Shutdown(absl::Status error) = 0; + + protected: + // Helper function to safely invoke on_handshake_done asynchronously. + // + // Note that on_handshake_done may complete in another thread as soon + // as this method returns, so the handshaker object may be destroyed + // by the callback unless the caller of this method is holding its own + // ref to the handshaker. + static void InvokeOnHandshakeDone( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done, + absl::Status status); }; // @@ -100,16 +115,11 @@ class Handshaker : public RefCounted { class HandshakeManager : public RefCounted { public: HandshakeManager(); - ~HandshakeManager() override; /// Adds a handshaker to the handshake manager. /// Takes ownership of \a handshaker. void Add(RefCountedPtr handshaker) ABSL_LOCKS_EXCLUDED(mu_); - /// Shuts down the handshake manager (e.g., to clean up when the operation is - /// aborted in the middle). - void Shutdown(grpc_error_handle why) ABSL_LOCKS_EXCLUDED(mu_); - /// Invokes handshakers in the order they were added. /// Takes ownership of \a endpoint, and then passes that ownership to /// the \a on_handshake_done callback. @@ -122,41 +132,39 @@ class HandshakeManager : public RefCounted { /// absl::OkStatus(), then handshaking failed and the handshaker has done /// the necessary clean-up. Otherwise, the callback takes ownership of /// the arguments. - void DoHandshake(grpc_endpoint* endpoint, const ChannelArgs& channel_args, - Timestamp deadline, grpc_tcp_server_acceptor* acceptor, - grpc_iomgr_cb_func on_handshake_done, void* user_data) - ABSL_LOCKS_EXCLUDED(mu_); + void DoHandshake(OrphanablePtr endpoint, + const ChannelArgs& channel_args, Timestamp deadline, + grpc_tcp_server_acceptor* acceptor, + absl::AnyInvocable)> + on_handshake_done) ABSL_LOCKS_EXCLUDED(mu_); - private: - bool CallNextHandshakerLocked(grpc_error_handle error) - ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + /// Shuts down the handshake manager (e.g., to clean up when the operation is + /// aborted in the middle). + void Shutdown(absl::Status error) ABSL_LOCKS_EXCLUDED(mu_); + private: // A function used as the handshaker-done callback when chaining // handshakers together. - static void CallNextHandshakerFn(void* arg, grpc_error_handle error) - ABSL_LOCKS_EXCLUDED(mu_); + void CallNextHandshakerLocked(absl::Status error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - static const size_t HANDSHAKERS_INIT_SIZE = 2; + static const size_t kHandshakerListInlineSize = 2; Mutex mu_; bool is_shutdown_ ABSL_GUARDED_BY(mu_) = false; - // An array of handshakers added via grpc_handshake_manager_add(). - absl::InlinedVector, HANDSHAKERS_INIT_SIZE> - handshakers_ ABSL_GUARDED_BY(mu_); // The index of the handshaker to invoke next and closure to invoke it. size_t index_ ABSL_GUARDED_BY(mu_) = 0; - grpc_closure call_next_handshaker_ ABSL_GUARDED_BY(mu_); - // The acceptor to call the handshakers with. - grpc_tcp_server_acceptor* acceptor_ ABSL_GUARDED_BY(mu_); - // The final callback and user_data to invoke after the last handshaker. - grpc_closure on_handshake_done_ ABSL_GUARDED_BY(mu_); + // An array of handshakers added via Add(). + absl::InlinedVector, kHandshakerListInlineSize> + handshakers_ ABSL_GUARDED_BY(mu_); // Handshaker args. HandshakerArgs args_ ABSL_GUARDED_BY(mu_); + // The final callback to invoke after the last handshaker. + absl::AnyInvocable)> on_handshake_done_ + ABSL_GUARDED_BY(mu_); // Deadline timer across all handshakers. grpc_event_engine::experimental::EventEngine::TaskHandle deadline_timer_handle_ ABSL_GUARDED_BY(mu_); - std::shared_ptr event_engine_ - ABSL_GUARDED_BY(mu_); }; } // namespace grpc_core diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index de3de3b843..2260224d10 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -23,8 +23,10 @@ #include #include +#include #include "absl/base/thread_annotations.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -33,7 +35,6 @@ #include #include #include -#include #include #include "src/core/handshaker/handshaker.h" @@ -50,6 +51,8 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/slice/slice_buffer.h" #include "src/core/util/http_client/format_request.h" #include "src/core/util/http_client/parser.h" #include "src/core/util/string.h" @@ -61,165 +64,148 @@ namespace { class HttpConnectHandshaker : public Handshaker { public: HttpConnectHandshaker(); - 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 "http_connect"; } + absl::string_view name() const override { return "http_connect"; } + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override; + void Shutdown(absl::Status error) override; private: ~HttpConnectHandshaker() override; - void CleanupArgsForFailureLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - void HandshakeFailedLocked(grpc_error_handle error) + void HandshakeFailedLocked(absl::Status error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - static void OnWriteDone(void* arg, grpc_error_handle error); - static void OnReadDone(void* arg, grpc_error_handle error); + void FinishLocked(absl::Status error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + void OnWriteDone(absl::Status error); + void OnReadDone(absl::Status error); + bool OnReadDoneLocked(absl::Status error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); static void OnWriteDoneScheduler(void* arg, grpc_error_handle error); static void OnReadDoneScheduler(void* arg, grpc_error_handle error); Mutex mu_; - bool is_shutdown_ ABSL_GUARDED_BY(mu_) = false; - // Read buffer to destroy after a shutdown. - 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; + absl::AnyInvocable on_handshake_done_ + ABSL_GUARDED_BY(mu_); // Objects for processing the HTTP CONNECT request and 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_); + SliceBuffer write_buffer_ ABSL_GUARDED_BY(mu_); + grpc_closure on_write_done_scheduler_ ABSL_GUARDED_BY(mu_); + grpc_closure on_read_done_scheduler_ ABSL_GUARDED_BY(mu_); grpc_http_parser http_parser_ ABSL_GUARDED_BY(mu_); grpc_http_response http_response_ ABSL_GUARDED_BY(mu_); }; HttpConnectHandshaker::~HttpConnectHandshaker() { - if (read_buffer_to_destroy_ != nullptr) { - grpc_slice_buffer_destroy(read_buffer_to_destroy_); - gpr_free(read_buffer_to_destroy_); - } - grpc_slice_buffer_destroy(&write_buffer_); grpc_http_parser_destroy(&http_parser_); grpc_http_response_destroy(&http_response_); } -// Set args fields to nullptr, saving the endpoint and read buffer for -// later destruction. -void HttpConnectHandshaker::CleanupArgsForFailureLocked() { - read_buffer_to_destroy_ = args_->read_buffer; - args_->read_buffer = nullptr; - args_->args = ChannelArgs(); -} - // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error_handle error) { +void HttpConnectHandshaker::HandshakeFailedLocked(absl::Status error) { if (error.ok()) { // If we were shut down after an endpoint operation succeeded but // before the endpoint callback was invoked, we need to generate our // own error. error = GRPC_ERROR_CREATE("Handshaker shutdown"); } - if (!is_shutdown_) { - // Not shutting down, so the handshake failed. Clean up before - // invoking the callback. - grpc_endpoint_destroy(args_->endpoint); - args_->endpoint = nullptr; - CleanupArgsForFailureLocked(); - // Set shutdown to true so that subsequent calls to - // http_connect_handshaker_shutdown() do nothing. - is_shutdown_ = true; - } // Invoke callback. - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); + FinishLocked(std::move(error)); +} + +void HttpConnectHandshaker::FinishLocked(absl::Status error) { + InvokeOnHandshakeDone(args_, std::move(on_handshake_done_), std::move(error)); } // This callback can be invoked inline while already holding onto the mutex. To // avoid deadlocks, schedule OnWriteDone on ExecCtx. +// TODO(roth): This hop will no longer be needed when we migrate to the +// EventEngine endpoint API. void HttpConnectHandshaker::OnWriteDoneScheduler(void* arg, grpc_error_handle error) { auto* handshaker = static_cast(arg); - ExecCtx::Run(DEBUG_LOCATION, - GRPC_CLOSURE_INIT(&handshaker->request_done_closure_, - &HttpConnectHandshaker::OnWriteDone, - handshaker, grpc_schedule_on_exec_ctx), - error); + handshaker->args_->event_engine->Run( + [handshaker, error = std::move(error)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + handshaker->OnWriteDone(std::move(error)); + }); } // Callback invoked when finished writing HTTP CONNECT request. -void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error_handle error) { - auto* handshaker = static_cast(arg); - ReleasableMutexLock lock(&handshaker->mu_); - if (!error.ok() || handshaker->is_shutdown_) { +void HttpConnectHandshaker::OnWriteDone(absl::Status error) { + ReleasableMutexLock lock(&mu_); + if (!error.ok() || args_->endpoint == nullptr) { // If the write failed or we're shutting down, clean up and invoke the // callback with the error. - handshaker->HandshakeFailedLocked(error); + HandshakeFailedLocked(error); lock.Release(); - handshaker->Unref(); + Unref(); } else { // Otherwise, read the response. // The read callback inherits our ref to the handshaker. grpc_endpoint_read( - handshaker->args_->endpoint, handshaker->args_->read_buffer, - GRPC_CLOSURE_INIT(&handshaker->response_read_closure_, - &HttpConnectHandshaker::OnReadDoneScheduler, - handshaker, grpc_schedule_on_exec_ctx), + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), + GRPC_CLOSURE_INIT(&on_read_done_scheduler_, + &HttpConnectHandshaker::OnReadDoneScheduler, this, + grpc_schedule_on_exec_ctx), /*urgent=*/true, /*min_progress_size=*/1); } } // This callback can be invoked inline while already holding onto the mutex. To // avoid deadlocks, schedule OnReadDone on ExecCtx. +// TODO(roth): This hop will no longer be needed when we migrate to the +// EventEngine endpoint API. void HttpConnectHandshaker::OnReadDoneScheduler(void* arg, grpc_error_handle error) { auto* handshaker = static_cast(arg); - ExecCtx::Run(DEBUG_LOCATION, - GRPC_CLOSURE_INIT(&handshaker->response_read_closure_, - &HttpConnectHandshaker::OnReadDone, handshaker, - grpc_schedule_on_exec_ctx), - error); + handshaker->args_->event_engine->Run( + [handshaker, error = std::move(error)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + handshaker->OnReadDone(std::move(error)); + }); } // Callback invoked for reading HTTP CONNECT response. -void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error_handle error) { - auto* handshaker = static_cast(arg); - ReleasableMutexLock lock(&handshaker->mu_); - if (!error.ok() || handshaker->is_shutdown_) { +void HttpConnectHandshaker::OnReadDone(absl::Status error) { + bool done; + { + MutexLock lock(&mu_); + done = OnReadDoneLocked(std::move(error)); + } + if (done) Unref(); +} + +bool HttpConnectHandshaker::OnReadDoneLocked(absl::Status error) { + if (!error.ok() || args_->endpoint == nullptr) { // If the read failed or we're shutting down, clean up and invoke the // callback with the error. - handshaker->HandshakeFailedLocked(error); - goto done; + HandshakeFailedLocked(std::move(error)); + return true; } // Add buffer to parser. - for (size_t i = 0; i < handshaker->args_->read_buffer->count; ++i) { - if (GRPC_SLICE_LENGTH(handshaker->args_->read_buffer->slices[i]) > 0) { + while (args_->read_buffer.Count() > 0) { + Slice slice = args_->read_buffer.TakeFirst(); + if (!slice.empty()) { size_t body_start_offset = 0; - error = grpc_http_parser_parse(&handshaker->http_parser_, - handshaker->args_->read_buffer->slices[i], + error = grpc_http_parser_parse(&http_parser_, slice.c_slice(), &body_start_offset); if (!error.ok()) { - handshaker->HandshakeFailedLocked(error); - goto done; + HandshakeFailedLocked(std::move(error)); + return true; } - if (handshaker->http_parser_.state == GRPC_HTTP_BODY) { + if (http_parser_.state == GRPC_HTTP_BODY) { // Remove the data we've already read from the read buffer, // leaving only the leftover bytes (if any). - grpc_slice_buffer tmp_buffer; - grpc_slice_buffer_init(&tmp_buffer); - if (body_start_offset < - GRPC_SLICE_LENGTH(handshaker->args_->read_buffer->slices[i])) { - grpc_slice_buffer_add( - &tmp_buffer, - grpc_slice_split_tail(&handshaker->args_->read_buffer->slices[i], - body_start_offset)); + SliceBuffer tmp_buffer; + if (body_start_offset < slice.length()) { + tmp_buffer.Append(slice.Split(body_start_offset)); } - grpc_slice_buffer_addn(&tmp_buffer, - &handshaker->args_->read_buffer->slices[i + 1], - handshaker->args_->read_buffer->count - i - 1); - grpc_slice_buffer_swap(handshaker->args_->read_buffer, &tmp_buffer); - grpc_slice_buffer_destroy(&tmp_buffer); + tmp_buffer.TakeAndAppend(args_->read_buffer); + tmp_buffer.Swap(&args_->read_buffer); break; } } @@ -235,65 +221,46 @@ void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error_handle error) { // need to fix the HTTP parser to understand when the body is // complete (e.g., handling chunked transfer encoding or looking // at the Content-Length: header). - if (handshaker->http_parser_.state != GRPC_HTTP_BODY) { - grpc_slice_buffer_reset_and_unref(handshaker->args_->read_buffer); + if (http_parser_.state != GRPC_HTTP_BODY) { + args_->read_buffer.Clear(); grpc_endpoint_read( - handshaker->args_->endpoint, handshaker->args_->read_buffer, - GRPC_CLOSURE_INIT(&handshaker->response_read_closure_, - &HttpConnectHandshaker::OnReadDoneScheduler, - handshaker, grpc_schedule_on_exec_ctx), + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), + GRPC_CLOSURE_INIT(&on_read_done_scheduler_, + &HttpConnectHandshaker::OnReadDoneScheduler, this, + grpc_schedule_on_exec_ctx), /*urgent=*/true, /*min_progress_size=*/1); - return; + return false; } // Make sure we got a 2xx response. - if (handshaker->http_response_.status < 200 || - handshaker->http_response_.status >= 300) { + if (http_response_.status < 200 || http_response_.status >= 300) { error = GRPC_ERROR_CREATE(absl::StrCat("HTTP proxy returned response code ", - handshaker->http_response_.status)); - handshaker->HandshakeFailedLocked(error); - goto done; + http_response_.status)); + HandshakeFailedLocked(std::move(error)); + return true; } // Success. Invoke handshake-done callback. - ExecCtx::Run(DEBUG_LOCATION, handshaker->on_handshake_done_, error); -done: - // Set shutdown to true so that subsequent calls to - // http_connect_handshaker_shutdown() do nothing. - handshaker->is_shutdown_ = true; - lock.Release(); - handshaker->Unref(); + FinishLocked(absl::OkStatus()); + return true; } // // Public handshaker methods // -void HttpConnectHandshaker::Shutdown(grpc_error_handle /*why*/) { - { - MutexLock lock(&mu_); - if (!is_shutdown_) { - is_shutdown_ = true; - grpc_endpoint_destroy(args_->endpoint); - args_->endpoint = nullptr; - CleanupArgsForFailureLocked(); - } - } +void HttpConnectHandshaker::Shutdown(absl::Status /*error*/) { + MutexLock lock(&mu_); + if (on_handshake_done_ != nullptr) args_->endpoint.reset(); } -void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) { +void HttpConnectHandshaker::DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) { // Check for HTTP CONNECT channel arg. // If not found, invoke on_handshake_done without doing anything. absl::optional server_name = args->args.GetString(GRPC_ARG_HTTP_CONNECT_SERVER); if (!server_name.has_value()) { - // Set shutdown to true so that subsequent calls to - // http_connect_handshaker_shutdown() do nothing. - { - MutexLock lock(&mu_); - is_shutdown_ = true; - } - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done, absl::OkStatus()); + InvokeOnHandshakeDone(args, std::move(on_handshake_done), absl::OkStatus()); return; } // Get headers from channel args. @@ -311,10 +278,9 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, gpr_malloc(sizeof(grpc_http_header) * num_header_strings)); for (size_t i = 0; i < num_header_strings; ++i) { char* sep = strchr(header_strings[i], ':'); - if (sep == nullptr) { - gpr_log(GPR_ERROR, "skipping unparseable HTTP CONNECT header: %s", - header_strings[i]); + LOG(ERROR) << "skipping unparseable HTTP CONNECT header: " + << header_strings[i]; continue; } *sep = '\0'; @@ -326,12 +292,12 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, // Save state in the handshaker object. MutexLock lock(&mu_); args_ = args; - on_handshake_done_ = on_handshake_done; + on_handshake_done_ = std::move(on_handshake_done); // Log connection via proxy. - std::string proxy_name(grpc_endpoint_get_peer(args->endpoint)); + std::string proxy_name(grpc_endpoint_get_peer(args->endpoint.get())); std::string server_name_string(*server_name); - gpr_log(GPR_INFO, "Connecting to server %s via HTTP proxy %s", - server_name_string.c_str(), proxy_name.c_str()); + VLOG(2) << "Connecting to server " << server_name_string << " via HTTP proxy " + << proxy_name; // Construct HTTP CONNECT request. grpc_http_request request; request.method = const_cast("CONNECT"); @@ -342,7 +308,7 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, request.body = nullptr; grpc_slice request_slice = grpc_httpcli_format_connect_request( &request, server_name_string.c_str(), server_name_string.c_str()); - grpc_slice_buffer_add(&write_buffer_, request_slice); + write_buffer_.Append(Slice(request_slice)); // Clean up. gpr_free(headers); for (size_t i = 0; i < num_header_strings; ++i) { @@ -352,15 +318,14 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, // Take a new ref to be held by the write callback. Ref().release(); grpc_endpoint_write( - args->endpoint, &write_buffer_, - GRPC_CLOSURE_INIT(&request_done_closure_, + args->endpoint.get(), write_buffer_.c_slice_buffer(), + GRPC_CLOSURE_INIT(&on_write_done_scheduler_, &HttpConnectHandshaker::OnWriteDoneScheduler, this, grpc_schedule_on_exec_ctx), nullptr, /*max_frame_size=*/INT_MAX); } HttpConnectHandshaker::HttpConnectHandshaker() { - grpc_slice_buffer_init(&write_buffer_); grpc_http_parser_init(&http_parser_, GRPC_HTTP_RESPONSE, &http_response_); } diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc index c989d28136..93c8e2fe8e 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.cc +++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc @@ -41,7 +41,6 @@ #include #include -#include #include #include "src/core/handshaker/http_connect/http_connect_handshaker.h" @@ -128,13 +127,12 @@ absl::optional GetHttpProxyServer( if (uri_str->empty()) return absl::nullopt; uri = URI::Parse(*uri_str); if (!uri.ok() || uri->authority().empty()) { - gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var. Error: %s", - uri.status().ToString().c_str()); + LOG(ERROR) << "cannot parse value of 'http_proxy' env var. Error: " + << uri.status(); return absl::nullopt; } if (uri->scheme() != "http") { - gpr_log(GPR_ERROR, "'%s' scheme not supported in proxy URI", - uri->scheme().c_str()); + LOG(ERROR) << "'" << uri->scheme() << "' scheme not supported in proxy URI"; return absl::nullopt; } // Split on '@' to separate user credentials from host @@ -193,9 +191,9 @@ absl::optional GetAddressProxyServer( } auto address = StringToSockaddr(*address_value); if (!address.ok()) { - gpr_log(GPR_ERROR, "cannot parse value of '%s' env var. Error: %s", - HttpProxyMapper::kAddressProxyEnvVar, - address.status().ToString().c_str()); + LOG(ERROR) << "cannot parse value of '" + << std::string(HttpProxyMapper::kAddressProxyEnvVar) + << "' env var. Error: " << address.status().ToString(); return absl::nullopt; } return *address; @@ -213,20 +211,17 @@ absl::optional HttpProxyMapper::MapName( if (!name_to_resolve.has_value()) return name_to_resolve; absl::StatusOr uri = URI::Parse(server_uri); if (!uri.ok() || uri->path().empty()) { - gpr_log(GPR_ERROR, - "'http_proxy' environment variable set, but cannot " - "parse server URI '%s' -- not using proxy. Error: %s", - std::string(server_uri).c_str(), uri.status().ToString().c_str()); + LOG(ERROR) << "'http_proxy' environment variable set, but cannot " + "parse server URI '" + << server_uri << "' -- not using proxy. Error: " << uri.status(); return absl::nullopt; } if (uri->scheme() == "unix") { - gpr_log(GPR_INFO, "not using proxy for Unix domain socket '%s'", - std::string(server_uri).c_str()); + VLOG(2) << "not using proxy for Unix domain socket '" << server_uri << "'"; return absl::nullopt; } if (uri->scheme() == "vsock") { - gpr_log(GPR_INFO, "not using proxy for VSock '%s'", - std::string(server_uri).c_str()); + VLOG(2) << "not using proxy for VSock '" << server_uri << "'"; return absl::nullopt; } // Prefer using 'no_grpc_proxy'. Fallback on 'no_proxy' if it is not set. @@ -239,18 +234,17 @@ absl::optional HttpProxyMapper::MapName( std::string server_port; if (!SplitHostPort(absl::StripPrefix(uri->path(), "/"), &server_host, &server_port)) { - gpr_log(GPR_INFO, - "unable to split host and port, not checking no_proxy list for " - "host '%s'", - std::string(server_uri).c_str()); + VLOG(2) << "unable to split host and port, not checking no_proxy list " + "for host '" + << server_uri << "'"; } else { auto address = StringToSockaddr(server_host, 0); if (AddressIncluded(address.ok() ? absl::optional(*address) : absl::nullopt, server_host, *no_proxy_str)) { - gpr_log(GPR_INFO, "not using proxy for host in no_proxy list '%s'", - std::string(server_uri).c_str()); + VLOG(2) << "not using proxy for host in no_proxy list '" << server_uri + << "'"; return absl::nullopt; } } @@ -275,14 +269,14 @@ absl::optional HttpProxyMapper::MapAddress( } auto address_string = grpc_sockaddr_to_string(&address, true); if (!address_string.ok()) { - gpr_log(GPR_ERROR, "Unable to convert address to string: %s", - std::string(address_string.status().message()).c_str()); + LOG(ERROR) << "Unable to convert address to string: " + << address_string.status(); return absl::nullopt; } std::string host_name, port; if (!SplitHostPort(*address_string, &host_name, &port)) { - gpr_log(GPR_ERROR, "Address %s cannot be split in host and port", - address_string->c_str()); + LOG(ERROR) << "Address " << *address_string + << " cannot be split in host and port"; return absl::nullopt; } auto enabled_addresses = GetChannelArgOrEnvVarValue( diff --git a/src/core/handshaker/security/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc index 18fde15243..8210ff57d7 100644 --- a/src/core/handshaker/security/secure_endpoint.cc +++ b/src/core/handshaker/security/secure_endpoint.cc @@ -23,6 +23,7 @@ #include #include #include +#include #include "absl/base/thread_annotations.h" #include "absl/log/check.h" @@ -37,15 +38,16 @@ #include #include #include -#include #include #include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.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/closure.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -64,17 +66,18 @@ static void on_read(void* user_data, grpc_error_handle error); static void on_write(void* user_data, grpc_error_handle error); namespace { -struct secure_endpoint { - secure_endpoint(const grpc_endpoint_vtable* vtable, +struct secure_endpoint : public grpc_endpoint { + secure_endpoint(const grpc_endpoint_vtable* vtbl, tsi_frame_protector* protector, tsi_zero_copy_grpc_protector* zero_copy_protector, - grpc_endpoint* transport, grpc_slice* leftover_slices, + grpc_core::OrphanablePtr endpoint, + grpc_slice* leftover_slices, const grpc_channel_args* channel_args, size_t leftover_nslices) - : wrapped_ep(transport), + : wrapped_ep(std::move(endpoint)), protector(protector), zero_copy_protector(zero_copy_protector) { - base.vtable = vtable; + this->vtable = vtbl; gpr_mu_init(&protector_mu); GRPC_CLOSURE_INIT(&on_read, ::on_read, this, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&on_write, ::on_write, this, grpc_schedule_on_exec_ctx); @@ -117,8 +120,7 @@ struct secure_endpoint { gpr_mu_destroy(&protector_mu); } - grpc_endpoint base; - grpc_endpoint* wrapped_ep; + grpc_core::OrphanablePtr wrapped_ep; struct tsi_frame_protector* protector; struct tsi_zero_copy_grpc_protector* zero_copy_protector; gpr_mu protector_mu; @@ -157,9 +159,8 @@ static void secure_endpoint_unref(secure_endpoint* ep, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(secure_endpoint)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->ref.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "SECENDP unref %p : %s %" PRIdPTR " -> %" PRIdPTR, ep, reason, val, - val - 1); + VLOG(2).AtLocation(file, line) << "SECENDP unref " << ep << " : " << reason + << " " << val << " -> " << val - 1; } if (gpr_unref(&ep->ref)) { destroy(ep); @@ -170,9 +171,8 @@ static void secure_endpoint_ref(secure_endpoint* ep, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(secure_endpoint)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->ref.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "SECENDP ref %p : %s %" PRIdPTR " -> %" PRIdPTR, ep, reason, val, - val + 1); + VLOG(2).AtLocation(file, line) << "SECENDP ref " << ep << " : " << reason + << " " << val << " -> " << val + 1; } gpr_ref(&ep->ref); } @@ -197,8 +197,7 @@ static void maybe_post_reclaimer(secure_endpoint* ep) { [ep](absl::optional sweep) { if (sweep.has_value()) { if (GRPC_TRACE_FLAG_ENABLED(resource_quota)) { - gpr_log(GPR_INFO, - "secure endpoint: benign reclamation to free memory"); + LOG(INFO) << "secure endpoint: benign reclamation to free memory"; } grpc_slice temp_read_slice; grpc_slice temp_write_slice; @@ -293,8 +292,7 @@ static void on_read(void* user_data, grpc_error_handle error) { &unprotected_buffer_size_written); gpr_mu_unlock(&ep->protector_mu); if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Decryption error: %s", - tsi_result_to_string(result)); + LOG(ERROR) << "Decryption error: " << tsi_result_to_string(result); break; } message_bytes += processed_message_size; @@ -365,8 +363,8 @@ static void endpoint_read(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, return; } - grpc_endpoint_read(ep->wrapped_ep, &ep->source_buffer, &ep->on_read, urgent, - /*min_progress_size=*/ep->min_progress_size); + grpc_endpoint_read(ep->wrapped_ep.get(), &ep->source_buffer, &ep->on_read, + urgent, /*min_progress_size=*/ep->min_progress_size); } static void flush_write_staging_buffer(secure_endpoint* ep, uint8_t** cur, @@ -445,8 +443,7 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, &protected_buffer_size_to_send); gpr_mu_unlock(&ep->protector_mu); if (result != TSI_OK) { - gpr_log(GPR_ERROR, "Encryption error: %s", - tsi_result_to_string(result)); + LOG(ERROR) << "Encryption error: " << tsi_result_to_string(result); break; } message_bytes += processed_message_size; @@ -500,52 +497,52 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, // output_buffer at any time until the write completes. SECURE_ENDPOINT_REF(ep, "write"); ep->write_cb = cb; - grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, &ep->on_write, arg, - max_frame_size); + grpc_endpoint_write(ep->wrapped_ep.get(), &ep->output_buffer, &ep->on_write, + arg, max_frame_size); } static void endpoint_destroy(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - grpc_endpoint_destroy(ep->wrapped_ep); + ep->wrapped_ep.reset(); SECURE_ENDPOINT_UNREF(ep, "destroy"); } static void endpoint_add_to_pollset(grpc_endpoint* secure_ep, grpc_pollset* pollset) { secure_endpoint* ep = reinterpret_cast(secure_ep); - grpc_endpoint_add_to_pollset(ep->wrapped_ep, pollset); + grpc_endpoint_add_to_pollset(ep->wrapped_ep.get(), pollset); } static void endpoint_add_to_pollset_set(grpc_endpoint* secure_ep, grpc_pollset_set* pollset_set) { secure_endpoint* ep = reinterpret_cast(secure_ep); - grpc_endpoint_add_to_pollset_set(ep->wrapped_ep, pollset_set); + grpc_endpoint_add_to_pollset_set(ep->wrapped_ep.get(), pollset_set); } static void endpoint_delete_from_pollset_set(grpc_endpoint* secure_ep, grpc_pollset_set* pollset_set) { secure_endpoint* ep = reinterpret_cast(secure_ep); - grpc_endpoint_delete_from_pollset_set(ep->wrapped_ep, pollset_set); + grpc_endpoint_delete_from_pollset_set(ep->wrapped_ep.get(), pollset_set); } static absl::string_view endpoint_get_peer(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - return grpc_endpoint_get_peer(ep->wrapped_ep); + return grpc_endpoint_get_peer(ep->wrapped_ep.get()); } static absl::string_view endpoint_get_local_address(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - return grpc_endpoint_get_local_address(ep->wrapped_ep); + return grpc_endpoint_get_local_address(ep->wrapped_ep.get()); } static int endpoint_get_fd(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - return grpc_endpoint_get_fd(ep->wrapped_ep); + return grpc_endpoint_get_fd(ep->wrapped_ep.get()); } static bool endpoint_can_track_err(grpc_endpoint* secure_ep) { secure_endpoint* ep = reinterpret_cast(secure_ep); - return grpc_endpoint_can_track_err(ep->wrapped_ep); + return grpc_endpoint_can_track_err(ep->wrapped_ep.get()); } static const grpc_endpoint_vtable vtable = {endpoint_read, @@ -559,13 +556,13 @@ static const grpc_endpoint_vtable vtable = {endpoint_read, endpoint_get_fd, endpoint_can_track_err}; -grpc_endpoint* grpc_secure_endpoint_create( +grpc_core::OrphanablePtr grpc_secure_endpoint_create( struct tsi_frame_protector* protector, struct tsi_zero_copy_grpc_protector* zero_copy_protector, - grpc_endpoint* to_wrap, grpc_slice* leftover_slices, - const grpc_channel_args* channel_args, size_t leftover_nslices) { - secure_endpoint* ep = - new secure_endpoint(&vtable, protector, zero_copy_protector, to_wrap, - leftover_slices, channel_args, leftover_nslices); - return &ep->base; + grpc_core::OrphanablePtr to_wrap, + grpc_slice* leftover_slices, const grpc_channel_args* channel_args, + size_t leftover_nslices) { + return grpc_core::MakeOrphanable( + &vtable, protector, zero_copy_protector, std::move(to_wrap), + leftover_slices, channel_args, leftover_nslices); } diff --git a/src/core/handshaker/security/secure_endpoint.h b/src/core/handshaker/security/secure_endpoint.h index a9d6d2088c..43add1a816 100644 --- a/src/core/handshaker/security/secure_endpoint.h +++ b/src/core/handshaker/security/secure_endpoint.h @@ -26,15 +26,17 @@ #include #include "src/core/lib/debug/trace.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/endpoint.h" // Takes ownership of protector, zero_copy_protector, and to_wrap, and refs // leftover_slices. If zero_copy_protector is not NULL, protector will never be // used. -grpc_endpoint* grpc_secure_endpoint_create( +grpc_core::OrphanablePtr grpc_secure_endpoint_create( struct tsi_frame_protector* protector, struct tsi_zero_copy_grpc_protector* zero_copy_protector, - grpc_endpoint* to_wrap, grpc_slice* leftover_slices, - const grpc_channel_args* channel_args, size_t leftover_nslices); + grpc_core::OrphanablePtr to_wrap, + grpc_slice* leftover_slices, const grpc_channel_args* channel_args, + size_t leftover_nslices); #endif // GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index dba7f399e1..58c9a16eae 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -28,6 +28,7 @@ #include #include "absl/base/attributes.h" +#include "absl/functional/any_invocable.h" #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" @@ -79,11 +80,11 @@ class SecurityHandshaker : public Handshaker { grpc_security_connector* connector, const ChannelArgs& args); ~SecurityHandshaker() 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"; } + absl::string_view name() const override { return "security"; } + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override; + void Shutdown(absl::Status error) override; private: grpc_error_handle DoHandshakerNextLocked(const unsigned char* bytes_received, @@ -92,12 +93,11 @@ class SecurityHandshaker : public Handshaker { 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_handle error); - void CleanupArgsForFailureLocked(); + void HandshakeFailedLocked(absl::Status error); + void Finish(absl::Status status); - static void OnHandshakeDataReceivedFromPeerFn(void* arg, - grpc_error_handle error); - static void OnHandshakeDataSentToPeerFn(void* arg, grpc_error_handle error); + void OnHandshakeDataReceivedFromPeerFn(absl::Status error); + void OnHandshakeDataSentToPeerFn(absl::Status error); static void OnHandshakeDataReceivedFromPeerFnScheduler( void* arg, grpc_error_handle error); static void OnHandshakeDataSentToPeerFnScheduler(void* arg, @@ -117,16 +117,14 @@ class SecurityHandshaker : public Handshaker { Mutex mu_; bool is_shutdown_ = false; - // Read buffer to destroy after a shutdown. - grpc_slice_buffer* read_buffer_to_destroy_ = nullptr; // State saved while performing the handshake. HandshakerArgs* args_ = nullptr; - grpc_closure* on_handshake_done_ = nullptr; + absl::AnyInvocable on_handshake_done_; size_t handshake_buffer_size_; unsigned char* handshake_buffer_; - grpc_slice_buffer outgoing_; + SliceBuffer outgoing_; grpc_closure on_handshake_data_sent_to_peer_; grpc_closure on_handshake_data_received_from_peer_; grpc_closure on_peer_checked_; @@ -146,7 +144,6 @@ SecurityHandshaker::SecurityHandshaker(tsi_handshaker* handshaker, static_cast(gpr_malloc(handshake_buffer_size_))), max_frame_size_( std::max(0, args.GetInt(GRPC_ARG_TSI_MAX_FRAME_SIZE).value_or(0))) { - grpc_slice_buffer_init(&outgoing_); GRPC_CLOSURE_INIT(&on_peer_checked_, &SecurityHandshaker::OnPeerCheckedFn, this, grpc_schedule_on_exec_ctx); } @@ -154,45 +151,30 @@ SecurityHandshaker::SecurityHandshaker(tsi_handshaker* handshaker, SecurityHandshaker::~SecurityHandshaker() { tsi_handshaker_destroy(handshaker_); tsi_handshaker_result_destroy(handshaker_result_); - if (read_buffer_to_destroy_ != nullptr) { - grpc_slice_buffer_destroy(read_buffer_to_destroy_); - gpr_free(read_buffer_to_destroy_); - } gpr_free(handshake_buffer_); - grpc_slice_buffer_destroy(&outgoing_); auth_context_.reset(DEBUG_LOCATION, "handshake"); connector_.reset(DEBUG_LOCATION, "handshake"); } size_t SecurityHandshaker::MoveReadBufferIntoHandshakeBuffer() { - size_t bytes_in_read_buffer = args_->read_buffer->length; + size_t bytes_in_read_buffer = args_->read_buffer.Length(); if (handshake_buffer_size_ < bytes_in_read_buffer) { handshake_buffer_ = static_cast( gpr_realloc(handshake_buffer_, bytes_in_read_buffer)); handshake_buffer_size_ = bytes_in_read_buffer; } size_t offset = 0; - while (args_->read_buffer->count > 0) { - grpc_slice* next_slice = grpc_slice_buffer_peek_first(args_->read_buffer); - memcpy(handshake_buffer_ + offset, GRPC_SLICE_START_PTR(*next_slice), - GRPC_SLICE_LENGTH(*next_slice)); - offset += GRPC_SLICE_LENGTH(*next_slice); - grpc_slice_buffer_remove_first(args_->read_buffer); + while (args_->read_buffer.Count() > 0) { + Slice slice = args_->read_buffer.TakeFirst(); + memcpy(handshake_buffer_ + offset, slice.data(), slice.size()); + offset += slice.size(); } return bytes_in_read_buffer; } -// Set args_ fields to NULL, saving the endpoint and read buffer for -// later destruction. -void SecurityHandshaker::CleanupArgsForFailureLocked() { - read_buffer_to_destroy_ = args_->read_buffer; - args_->read_buffer = nullptr; - args_->args = ChannelArgs(); -} - // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -void SecurityHandshaker::HandshakeFailedLocked(grpc_error_handle error) { +void SecurityHandshaker::HandshakeFailedLocked(absl::Status error) { if (error.ok()) { // If we were shut down after the handshake succeeded but before an // endpoint callback was invoked, we need to generate our own error. @@ -200,17 +182,17 @@ void SecurityHandshaker::HandshakeFailedLocked(grpc_error_handle error) { } if (!is_shutdown_) { tsi_handshaker_shutdown(handshaker_); - grpc_endpoint_destroy(args_->endpoint); - args_->endpoint = nullptr; - // Not shutting down, so the write failed. Clean up before - // invoking the callback. - CleanupArgsForFailureLocked(); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. is_shutdown_ = true; } // Invoke callback. - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); + Finish(std::move(error)); +} + +void SecurityHandshaker::Finish(absl::Status status) { + InvokeOnHandshakeDone(args_, std::move(on_handshake_done_), + std::move(status)); } namespace { @@ -306,19 +288,18 @@ void SecurityHandshaker::OnPeerCheckedInner(grpc_error_handle error) { grpc_slice slice = grpc_slice_from_copied_buffer( reinterpret_cast(unused_bytes), unused_bytes_size); args_->endpoint = grpc_secure_endpoint_create( - protector, zero_copy_protector, args_->endpoint, &slice, + protector, zero_copy_protector, std::move(args_->endpoint), &slice, args_->args.ToC().get(), 1); CSliceUnref(slice); } else { args_->endpoint = grpc_secure_endpoint_create( - protector, zero_copy_protector, args_->endpoint, nullptr, + protector, zero_copy_protector, std::move(args_->endpoint), nullptr, args_->args.ToC().get(), 0); } } else if (unused_bytes_size > 0) { // Not wrapping the endpoint, so just pass along unused bytes. - grpc_slice slice = grpc_slice_from_copied_buffer( - reinterpret_cast(unused_bytes), unused_bytes_size); - grpc_slice_buffer_add(args_->read_buffer, slice); + args_->read_buffer.Append(Slice::FromCopiedBuffer( + reinterpret_cast(unused_bytes), unused_bytes_size)); } // Done with handshaker result. tsi_handshaker_result_destroy(handshaker_result_); @@ -329,11 +310,11 @@ void SecurityHandshaker::OnPeerCheckedInner(grpc_error_handle error) { args_->args = args_->args.SetObject( MakeChannelzSecurityFromAuthContext(auth_context_.get())); } - // Invoke callback. - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, absl::OkStatus()); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. is_shutdown_ = true; + // Invoke callback. + Finish(absl::OkStatus()); } void SecurityHandshaker::OnPeerCheckedFn(void* arg, grpc_error_handle error) { @@ -349,8 +330,8 @@ grpc_error_handle SecurityHandshaker::CheckPeerLocked() { return GRPC_ERROR_CREATE(absl::StrCat("Peer extraction failed (", tsi_result_to_string(result), ")")); } - connector_->check_peer(peer, args_->endpoint, args_->args, &auth_context_, - &on_peer_checked_); + connector_->check_peer(peer, args_->endpoint.get(), args_->args, + &auth_context_, &on_peer_checked_); grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( auth_context_.get(), GRPC_TRANSPORT_SECURITY_LEVEL_PROPERTY_NAME); const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it); @@ -374,7 +355,7 @@ grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( if (result == TSI_INCOMPLETE_DATA) { CHECK_EQ(bytes_to_send_size, 0u); grpc_endpoint_read( - args_->endpoint, args_->read_buffer, + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), GRPC_CLOSURE_INIT( &on_handshake_data_received_from_peer_, &SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler, @@ -388,6 +369,8 @@ grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( if (security_connector != nullptr) { connector_type = security_connector->type().name(); } + // TODO(roth): Get a better signal from the TSI layer as to what + // status code we should use here. return GRPC_ERROR_CREATE(absl::StrCat( connector_type, " handshake failed (", tsi_result_to_string(result), ")", (tsi_handshake_error_.empty() ? "" : ": "), tsi_handshake_error_)); @@ -399,12 +382,11 @@ grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( } if (bytes_to_send_size > 0) { // Send data to peer, if needed. - grpc_slice to_send = grpc_slice_from_copied_buffer( - reinterpret_cast(bytes_to_send), bytes_to_send_size); - grpc_slice_buffer_reset_and_unref(&outgoing_); - grpc_slice_buffer_add(&outgoing_, to_send); + outgoing_.Clear(); + outgoing_.Append(Slice::FromCopiedBuffer( + reinterpret_cast(bytes_to_send), bytes_to_send_size)); grpc_endpoint_write( - args_->endpoint, &outgoing_, + args_->endpoint.get(), outgoing_.c_slice_buffer(), GRPC_CLOSURE_INIT( &on_handshake_data_sent_to_peer_, &SecurityHandshaker::OnHandshakeDataSentToPeerFnScheduler, this, @@ -413,7 +395,7 @@ grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( } else if (handshaker_result == nullptr) { // There is nothing to send, but need to read from peer. grpc_endpoint_read( - args_->endpoint, args_->read_buffer, + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), GRPC_CLOSURE_INIT( &on_handshake_data_received_from_peer_, &SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler, @@ -435,7 +417,7 @@ void SecurityHandshaker::OnHandshakeNextDoneGrpcWrapper( grpc_error_handle error = h->OnHandshakeNextDoneLocked( result, bytes_to_send, bytes_to_send_size, handshaker_result); if (!error.ok()) { - h->HandshakeFailedLocked(error); + h->HandshakeFailedLocked(std::move(error)); } else { h.release(); // Avoid unref } @@ -463,102 +445,102 @@ grpc_error_handle 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. +// so run OnHandshakeDataReceivedFromPeerFn asynchronously to avoid a deadlock. +// TODO(roth): This will no longer be necessary once we migrate to the +// EventEngine endpoint API. void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler( void* arg, grpc_error_handle error) { - SecurityHandshaker* h = static_cast(arg); - ExecCtx::Run( - DEBUG_LOCATION, - GRPC_CLOSURE_INIT(&h->on_handshake_data_received_from_peer_, - &SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn, - h, grpc_schedule_on_exec_ctx), - error); + SecurityHandshaker* handshaker = static_cast(arg); + handshaker->args_->event_engine->Run( + [handshaker, error = std::move(error)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + handshaker->OnHandshakeDataReceivedFromPeerFn(std::move(error)); + }); } -void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn( - void* arg, grpc_error_handle error) { - RefCountedPtr h(static_cast(arg)); - MutexLock lock(&h->mu_); - if (!error.ok() || h->is_shutdown_) { - h->HandshakeFailedLocked( +void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn(absl::Status error) { + RefCountedPtr handshaker(this); + MutexLock lock(&mu_); + if (!error.ok() || is_shutdown_) { + HandshakeFailedLocked( GRPC_ERROR_CREATE_REFERENCING("Handshake read failed", &error, 1)); return; } // Copy all slices received. - size_t bytes_received_size = h->MoveReadBufferIntoHandshakeBuffer(); + size_t bytes_received_size = MoveReadBufferIntoHandshakeBuffer(); // Call TSI handshaker. - error = h->DoHandshakerNextLocked(h->handshake_buffer_, bytes_received_size); + error = DoHandshakerNextLocked(handshake_buffer_, bytes_received_size); if (!error.ok()) { - h->HandshakeFailedLocked(error); + HandshakeFailedLocked(std::move(error)); } else { - h.release(); // Avoid unref + handshaker.release(); // Avoid unref } } // This callback might be run inline while we are still holding on to the mutex, -// so schedule OnHandshakeDataSentToPeerFn on ExecCtx to avoid a deadlock. +// so run OnHandshakeDataSentToPeerFn asynchronously to avoid a deadlock. +// TODO(roth): This will no longer be necessary once we migrate to the +// EventEngine endpoint API. void SecurityHandshaker::OnHandshakeDataSentToPeerFnScheduler( void* arg, grpc_error_handle error) { - SecurityHandshaker* h = static_cast(arg); - ExecCtx::Run( - DEBUG_LOCATION, - GRPC_CLOSURE_INIT(&h->on_handshake_data_sent_to_peer_, - &SecurityHandshaker::OnHandshakeDataSentToPeerFn, h, - grpc_schedule_on_exec_ctx), - error); + SecurityHandshaker* handshaker = static_cast(arg); + handshaker->args_->event_engine->Run( + [handshaker, error = std::move(error)]() mutable { + ApplicationCallbackExecCtx callback_exec_ctx; + ExecCtx exec_ctx; + handshaker->OnHandshakeDataSentToPeerFn(std::move(error)); + }); } -void SecurityHandshaker::OnHandshakeDataSentToPeerFn(void* arg, - grpc_error_handle error) { - RefCountedPtr h(static_cast(arg)); - MutexLock lock(&h->mu_); - if (!error.ok() || h->is_shutdown_) { - h->HandshakeFailedLocked( +void SecurityHandshaker::OnHandshakeDataSentToPeerFn(absl::Status error) { + RefCountedPtr handshaker(this); + MutexLock lock(&mu_); + if (!error.ok() || is_shutdown_) { + HandshakeFailedLocked( GRPC_ERROR_CREATE_REFERENCING("Handshake write failed", &error, 1)); return; } // We may be done. - if (h->handshaker_result_ == nullptr) { + if (handshaker_result_ == nullptr) { grpc_endpoint_read( - h->args_->endpoint, h->args_->read_buffer, + args_->endpoint.get(), args_->read_buffer.c_slice_buffer(), GRPC_CLOSURE_INIT( - &h->on_handshake_data_received_from_peer_, + &on_handshake_data_received_from_peer_, &SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler, - h.get(), grpc_schedule_on_exec_ctx), + this, grpc_schedule_on_exec_ctx), /*urgent=*/true, /*min_progress_size=*/1); } else { - error = h->CheckPeerLocked(); + error = CheckPeerLocked(); if (!error.ok()) { - h->HandshakeFailedLocked(error); + HandshakeFailedLocked(error); return; } } - h.release(); // Avoid unref + handshaker.release(); // Avoid unref } // // public handshaker API // -void SecurityHandshaker::Shutdown(grpc_error_handle why) { +void SecurityHandshaker::Shutdown(grpc_error_handle error) { MutexLock lock(&mu_); if (!is_shutdown_) { is_shutdown_ = true; - connector_->cancel_check_peer(&on_peer_checked_, why); + connector_->cancel_check_peer(&on_peer_checked_, std::move(error)); tsi_handshaker_shutdown(handshaker_); - grpc_endpoint_destroy(args_->endpoint); - args_->endpoint = nullptr; - CleanupArgsForFailureLocked(); + args_->endpoint.reset(); } } -void SecurityHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) { +void SecurityHandshaker::DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) { auto ref = Ref(); MutexLock lock(&mu_); args_ = args; - on_handshake_done_ = on_handshake_done; + on_handshake_done_ = std::move(on_handshake_done); size_t bytes_received_size = MoveReadBufferIntoHandshakeBuffer(); grpc_error_handle error = DoHandshakerNextLocked(handshake_buffer_, bytes_received_size); @@ -576,19 +558,13 @@ void SecurityHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, class FailHandshaker : public Handshaker { public: explicit FailHandshaker(absl::Status status) : status_(std::move(status)) {} - const char* name() const override { return "security_fail"; } - void Shutdown(grpc_error_handle /*why*/) override {} - void DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) override { - grpc_endpoint_destroy(args->endpoint); - args->endpoint = nullptr; - args->args = ChannelArgs(); - grpc_slice_buffer_destroy(args->read_buffer); - gpr_free(args->read_buffer); - args->read_buffer = nullptr; - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done, status_); + absl::string_view name() const override { return "security_fail"; } + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override { + InvokeOnHandshakeDone(args, std::move(on_handshake_done), status_); } + void Shutdown(absl::Status /*error*/) override {} private: ~FailHandshaker() override = default; diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index fd557e47dc..7822a5cebe 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -19,8 +19,10 @@ #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h" #include +#include #include "absl/base/thread_annotations.h" +#include "absl/functional/any_invocable.h" #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -61,24 +63,23 @@ namespace { class TCPConnectHandshaker : public Handshaker { public: explicit TCPConnectHandshaker(grpc_pollset_set* pollset_set); - 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 "tcp_connect"; } + absl::string_view name() const override { return "tcp_connect"; } + void DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) override; + void Shutdown(absl::Status error) override; private: ~TCPConnectHandshaker() override; - void CleanupArgsForFailureLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - void FinishLocked(grpc_error_handle error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + void FinishLocked(absl::Status error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); static void Connected(void* arg, grpc_error_handle error); Mutex mu_; bool shutdown_ ABSL_GUARDED_BY(mu_) = false; - // Endpoint and read buffer to destroy after a shutdown. + // Endpoint to destroy after a shutdown. grpc_endpoint* endpoint_to_destroy_ ABSL_GUARDED_BY(mu_) = nullptr; - grpc_slice_buffer* read_buffer_to_destroy_ ABSL_GUARDED_BY(mu_) = nullptr; - grpc_closure* on_handshake_done_ ABSL_GUARDED_BY(mu_) = nullptr; + absl::AnyInvocable on_handshake_done_ + ABSL_GUARDED_BY(mu_); grpc_pollset_set* interested_parties_ = nullptr; grpc_polling_entity pollent_; HandshakerArgs* args_ = nullptr; @@ -99,33 +100,32 @@ TCPConnectHandshaker::TCPConnectHandshaker(grpc_pollset_set* pollset_set) GRPC_CLOSURE_INIT(&connected_, Connected, this, grpc_schedule_on_exec_ctx); } -void TCPConnectHandshaker::Shutdown(grpc_error_handle /*why*/) { +void TCPConnectHandshaker::Shutdown(absl::Status /*error*/) { // TODO(anramach): After migration to EventEngine, cancel the in-progress // TCP connection attempt. - { - MutexLock lock(&mu_); - if (!shutdown_) { - shutdown_ = true; - // If we are shutting down while connecting, respond back with - // handshake done. - // The callback from grpc_tcp_client_connect will perform - // the necessary clean up. - if (on_handshake_done_ != nullptr) { - CleanupArgsForFailureLocked(); - FinishLocked(GRPC_ERROR_CREATE("tcp handshaker shutdown")); - } + MutexLock lock(&mu_); + if (!shutdown_) { + shutdown_ = true; + // If we are shutting down while connecting, respond back with + // handshake done. + // The callback from grpc_tcp_client_connect will perform + // the necessary clean up. + if (on_handshake_done_ != nullptr) { + // TODO(roth): When we remove the legacy grpc_error APIs, propagate the + // status passed to shutdown as part of the message here. + FinishLocked(GRPC_ERROR_CREATE("tcp handshaker shutdown")); } } } -void TCPConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, - grpc_closure* on_handshake_done, - HandshakerArgs* args) { +void TCPConnectHandshaker::DoHandshake( + HandshakerArgs* args, + absl::AnyInvocable on_handshake_done) { { MutexLock lock(&mu_); - on_handshake_done_ = on_handshake_done; + on_handshake_done_ = std::move(on_handshake_done); } - CHECK_EQ(args->endpoint, nullptr); + CHECK_EQ(args->endpoint.get(), nullptr); args_ = args; absl::StatusOr uri = URI::Parse( args->args.GetString(GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS).value()); @@ -149,7 +149,7 @@ void TCPConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, Ref().release(); // Ref held by callback. // As we fake the TCP client connection failure when shutdown is called // we don't want to pass args->endpoint directly. - // Instead pass endpoint_ and swap this endpoint to + // Instead pass endpoint_to_destroy_ and swap this endpoint to // args endpoint on success. grpc_tcp_client_connect( &connected_, &endpoint_to_destroy_, interested_parties_, @@ -171,21 +171,19 @@ void TCPConnectHandshaker::Connected(void* arg, grpc_error_handle error) { self->endpoint_to_destroy_ = nullptr; } if (!self->shutdown_) { - self->CleanupArgsForFailureLocked(); self->shutdown_ = true; - self->FinishLocked(error); + self->FinishLocked(std::move(error)); } else { - // The on_handshake_done_ is already as part of shutdown when - // connecting So nothing to be done here other than unrefing the - // error. + // The on_handshake_done_ callback was already invoked as part of + // shutdown when connecting, so nothing to be done here. } return; } CHECK_NE(self->endpoint_to_destroy_, nullptr); - self->args_->endpoint = self->endpoint_to_destroy_; + self->args_->endpoint.reset(self->endpoint_to_destroy_); self->endpoint_to_destroy_ = nullptr; if (self->bind_endpoint_to_pollset_) { - grpc_endpoint_add_to_pollset_set(self->args_->endpoint, + grpc_endpoint_add_to_pollset_set(self->args_->endpoint.get(), self->interested_parties_); } self->FinishLocked(absl::OkStatus()); @@ -196,25 +194,14 @@ TCPConnectHandshaker::~TCPConnectHandshaker() { if (endpoint_to_destroy_ != nullptr) { grpc_endpoint_destroy(endpoint_to_destroy_); } - if (read_buffer_to_destroy_ != nullptr) { - grpc_slice_buffer_destroy(read_buffer_to_destroy_); - gpr_free(read_buffer_to_destroy_); - } grpc_pollset_set_destroy(interested_parties_); } -void TCPConnectHandshaker::CleanupArgsForFailureLocked() { - read_buffer_to_destroy_ = args_->read_buffer; - args_->read_buffer = nullptr; - args_->args = ChannelArgs(); -} - -void TCPConnectHandshaker::FinishLocked(grpc_error_handle error) { +void TCPConnectHandshaker::FinishLocked(absl::Status error) { if (interested_parties_ != nullptr) { grpc_polling_entity_del_from_pollset_set(&pollent_, interested_parties_); } - ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); - on_handshake_done_ = nullptr; + InvokeOnHandshakeDone(args_, std::move(on_handshake_done_), std::move(error)); } // diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 55cb2785ab..301c0c287c 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -558,6 +558,11 @@ class ChannelArgs { bool WantMinimalStack() const; std::string ToString() const; + template + friend void AbslStringify(Sink& sink, const ChannelArgs& args) { + sink.Append(args.ToString()); + } + private: explicit ChannelArgs(AVL args); diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc index 63e322d6b9..36e3461700 100644 --- a/src/core/lib/channel/channel_stack.cc +++ b/src/core/lib/channel/channel_stack.cc @@ -262,7 +262,9 @@ void grpc_call_stack_destroy(grpc_call_stack* stack, void grpc_call_next_op(grpc_call_element* elem, grpc_transport_stream_op_batch* op) { grpc_call_element* next_elem = elem + 1; - GRPC_CALL_LOG_OP(GPR_INFO, next_elem, op); + GRPC_TRACE_LOG(channel, INFO) + << "OP[" << elem->filter->name << ":" << elem + << "]: " << grpc_transport_stream_op_batch_string(op, false); next_elem->filter->start_transport_stream_op_batch(next_elem, op); } @@ -292,10 +294,3 @@ grpc_call_stack* grpc_call_stack_from_top_element(grpc_call_element* elem) { void grpc_channel_stack_no_post_init(grpc_channel_stack*, grpc_channel_element*) {} - -void grpc_call_log_op(const char* file, int line, gpr_log_severity severity, - grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { - gpr_log(file, line, severity, "OP[%s:%p]: %s", elem->filter->name, elem, - grpc_transport_stream_op_batch_string(op, false).c_str()); -} diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index ff0fc291c0..f21c1dc0d8 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -63,6 +63,7 @@ #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" @@ -159,7 +160,7 @@ struct grpc_channel_filter { const grpc_channel_info* channel_info); // The name of this filter - const char* name; + grpc_core::UniqueTypeName name; }; // A channel_element tracks its filter and the filter requested memory within // a channel allocation @@ -357,18 +358,7 @@ grpc_channel_stack* grpc_channel_stack_from_top_element( // Given the top element of a call stack, get the call stack itself grpc_call_stack* grpc_call_stack_from_top_element(grpc_call_element* elem); -void grpc_call_log_op(const char* file, int line, gpr_log_severity severity, - grpc_call_element* elem, - grpc_transport_stream_op_batch* op); - void grpc_channel_stack_no_post_init(grpc_channel_stack* stk, grpc_channel_element* elem); -#define GRPC_CALL_LOG_OP(sev, elem, op) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(channel)) { \ - grpc_call_log_op(sev, elem, op); \ - } \ - } while (0) - #endif // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 5507e1ef65..f24304bac8 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -267,7 +267,7 @@ const grpc_channel_filter kConnectedFilter{ }, connected_channel_destroy_channel_elem, connected_channel_get_channel_info, - "connected", + GRPC_UNIQUE_TYPE_NAME_HERE("connected"), }; // noop filter for the v3 stack: placeholder for now because other code requires @@ -288,7 +288,7 @@ const grpc_channel_filter kPromiseBasedTransportFilter = { +[](grpc_channel_stack*, grpc_channel_element*) {}, connected_channel_destroy_channel_elem, connected_channel_get_channel_info, - "connected", + GRPC_UNIQUE_TYPE_NAME_HERE("connected"), }; bool TransportSupportsClientPromiseBasedCalls(const ChannelArgs& args) { diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index e2d9d8cfff..a5c2bed786 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -23,6 +23,7 @@ #include "absl/base/attributes.h" #include "absl/functional/function_ref.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -99,11 +100,7 @@ BaseCallData::BaseCallData( receive_message_( flags & kFilterExaminesInboundMessages ? arena_->New(this, make_recv_interceptor()) - : nullptr), - event_engine_( - ChannelFilterFromElem(elem) - ->hack_until_per_channel_stack_event_engines_land_get_event_engine()) { -} + : nullptr) {} BaseCallData::~BaseCallData() { FakeActivity(this).Run([this] { @@ -211,8 +208,8 @@ void BaseCallData::CapturedBatch::ResumeWith(Flusher* releaser) { if (refcnt == 0) { // refcnt==0 ==> cancelled if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%sRESUME BATCH REQUEST CANCELLED", - releaser->call()->DebugTag().c_str()); + LOG(INFO) << releaser->call()->DebugTag() + << "RESUME BATCH REQUEST CANCELLED"; } return; } @@ -267,8 +264,8 @@ BaseCallData::Flusher::~Flusher() { BaseCallData* call = static_cast(batch->handler_private.extra_arg); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "FLUSHER:forward batch via closure: %s", - grpc_transport_stream_op_batch_string(batch, false).c_str()); + LOG(INFO) << "FLUSHER:forward batch via closure: " + << grpc_transport_stream_op_batch_string(batch, false); } grpc_call_next_op(call->elem(), batch); GRPC_CALL_STACK_UNREF(call->call_stack(), "flusher_batch"); @@ -279,9 +276,8 @@ BaseCallData::Flusher::~Flusher() { batch->is_traced = true; } if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log( - GPR_INFO, "FLUSHER:queue batch to forward in closure: %s", - grpc_transport_stream_op_batch_string(release_[i], false).c_str()); + LOG(INFO) << "FLUSHER:queue batch to forward in closure: " + << grpc_transport_stream_op_batch_string(release_[i], false); } batch->handler_private.extra_arg = call_; GRPC_CLOSURE_INIT(&batch->handler_private.closure, call_next_op, batch, @@ -292,8 +288,8 @@ BaseCallData::Flusher::~Flusher() { } call_closures_.RunClosuresWithoutYielding(call_->call_combiner()); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "FLUSHER:forward batch: %s", - grpc_transport_stream_op_batch_string(release_[0], false).c_str()); + LOG(INFO) << "FLUSHER:forward batch: " + << grpc_transport_stream_op_batch_string(release_[0], false); } if (call_->call() != nullptr && call_->call()->traced()) { release_[0]->is_traced = true; @@ -333,8 +329,8 @@ const char* BaseCallData::SendMessage::StateString(State state) { void BaseCallData::SendMessage::StartOp(CapturedBatch batch) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.StartOp st=%s", base_->LogTag().c_str(), - StateString(state_)); + LOG(INFO) << base_->LogTag() + << " SendMessage.StartOp st=" << StateString(state_); } switch (state_) { case State::kInitial: @@ -361,8 +357,8 @@ void BaseCallData::SendMessage::StartOp(CapturedBatch batch) { template void BaseCallData::SendMessage::GotPipe(T* pipe_end) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.GotPipe st=%s", base_->LogTag().c_str(), - StateString(state_)); + LOG(INFO) << base_->LogTag() + << " SendMessage.GotPipe st=" << StateString(state_); } CHECK_NE(pipe_end, nullptr); switch (state_) { @@ -409,9 +405,9 @@ bool BaseCallData::SendMessage::IsIdle() const { void BaseCallData::SendMessage::OnComplete(absl::Status status) { Flusher flusher(base_); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.OnComplete st=%s status=%s", - base_->LogTag().c_str(), StateString(state_), - status.ToString().c_str()); + LOG(INFO) << base_->LogTag() + << " SendMessage.OnComplete st=" << StateString(state_) + << " status=" << status; } switch (state_) { case State::kInitial: @@ -440,9 +436,9 @@ void BaseCallData::SendMessage::OnComplete(absl::Status status) { void BaseCallData::SendMessage::Done(const ServerMetadata& metadata, Flusher* flusher) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.Done st=%s md=%s", - base_->LogTag().c_str(), StateString(state_), - metadata.DebugString().c_str()); + LOG(INFO) << base_->LogTag() + << " SendMessage.Done st=" << StateString(state_) + << " md=" << metadata.DebugString(); } switch (state_) { case State::kCancelled: @@ -483,11 +479,11 @@ void BaseCallData::SendMessage::Done(const ServerMetadata& metadata, void BaseCallData::SendMessage::WakeInsideCombiner(Flusher* flusher, bool allow_push_to_pipe) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s SendMessage.WakeInsideCombiner st=%s%s", - base_->LogTag().c_str(), StateString(state_), - state_ == State::kBatchCompleted - ? absl::StrCat(" status=", completed_status_.ToString()).c_str() - : ""); + LOG(INFO) << base_->LogTag() + << " SendMessage.WakeInsideCombiner st=" << StateString(state_) + << (state_ == State::kBatchCompleted + ? absl::StrCat(" status=", completed_status_.ToString()) + : ""); } switch (state_) { case State::kInitial: @@ -517,9 +513,10 @@ void BaseCallData::SendMessage::WakeInsideCombiner(Flusher* flusher, auto r_push = (*push_)(); if (auto* p = r_push.value_if_ready()) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s SendMessage.WakeInsideCombiner push complete, result=%s", - base_->LogTag().c_str(), *p ? "true" : "false"); + LOG(INFO) << base_->LogTag() + << " SendMessage.WakeInsideCombiner push complete, " + "result=" + << (*p ? "true" : "false"); } // We haven't pulled through yet, so this certainly shouldn't succeed. CHECK(!*p); @@ -531,10 +528,10 @@ void BaseCallData::SendMessage::WakeInsideCombiner(Flusher* flusher, auto r_next = (*next_)(); if (auto* p = r_next.value_if_ready()) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s SendMessage.WakeInsideCombiner next complete, " - "result.has_value=%s", - base_->LogTag().c_str(), p->has_value() ? "true" : "false"); + LOG(INFO) << base_->LogTag() + << " SendMessage.WakeInsideCombiner next complete, " + "result.has_value=" + << (p->has_value() ? "true" : "false"); } if (p->has_value()) { batch_->payload->send_message.send_message->Swap((**p)->payload()); @@ -616,8 +613,8 @@ const char* BaseCallData::ReceiveMessage::StateString(State state) { void BaseCallData::ReceiveMessage::StartOp(CapturedBatch& batch) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ReceiveMessage.StartOp st=%s", - base_->LogTag().c_str(), StateString(state_)); + LOG(INFO) << base_->LogTag() + << " ReceiveMessage.StartOp st=" << StateString(state_); } switch (state_) { case State::kInitial: @@ -657,8 +654,8 @@ void BaseCallData::ReceiveMessage::StartOp(CapturedBatch& batch) { template void BaseCallData::ReceiveMessage::GotPipe(T* pipe_end) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ReceiveMessage.GotPipe st=%s", - base_->LogTag().c_str(), StateString(state_)); + LOG(INFO) << base_->LogTag() + << " ReceiveMessage.GotPipe st=" << StateString(state_); } switch (state_) { case State::kInitial: @@ -693,9 +690,9 @@ void BaseCallData::ReceiveMessage::GotPipe(T* pipe_end) { void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ReceiveMessage.OnComplete st=%s status=%s", - base_->LogTag().c_str(), StateString(state_), - status.ToString().c_str()); + LOG(INFO) << base_->LogTag() + << " ReceiveMessage.OnComplete st=" << StateString(state_) + << " status=" << status; } switch (state_) { case State::kInitial: @@ -734,9 +731,9 @@ void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) { void BaseCallData::ReceiveMessage::Done(const ServerMetadata& metadata, Flusher* flusher) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ReceiveMessage.Done st=%s md=%s", - base_->LogTag().c_str(), StateString(state_), - metadata.DebugString().c_str()); + LOG(INFO) << base_->LogTag() + << " ReceiveMessage.Done st=" << StateString(state_) + << " md=" << metadata.DebugString(); } switch (state_) { case State::kInitial: @@ -793,12 +790,11 @@ void BaseCallData::ReceiveMessage::Done(const ServerMetadata& metadata, void BaseCallData::ReceiveMessage::WakeInsideCombiner(Flusher* flusher, bool allow_push_to_pipe) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ReceiveMessage.WakeInsideCombiner st=%s push?=%s next?=%s " - "allow_push_to_pipe=%s", - base_->LogTag().c_str(), StateString(state_), - push_.has_value() ? "yes" : "no", next_.has_value() ? "yes" : "no", - allow_push_to_pipe ? "yes" : "no"); + LOG(INFO) << base_->LogTag() + << " ReceiveMessage.WakeInsideCombiner st=" << StateString(state_) + << " push?=" << (push_.has_value() ? "yes" : "no") + << " next?=" << (next_.has_value() ? "yes" : "no") + << " allow_push_to_pipe=" << (allow_push_to_pipe ? "yes" : "no"); } switch (state_) { case State::kInitial: @@ -855,9 +851,9 @@ void BaseCallData::ReceiveMessage::WakeInsideCombiner(Flusher* flusher, auto r_push = (*push_)(); if (auto* p = r_push.value_if_ready()) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ReceiveMessage.WakeInsideCombiner push complete: %s", - base_->LogTag().c_str(), *p ? "true" : "false"); + LOG(INFO) << base_->LogTag() + << " ReceiveMessage.WakeInsideCombiner push complete: " + << (*p ? "true" : "false"); } // We haven't pulled through yet, so this certainly shouldn't succeed. CHECK(!*p); @@ -886,12 +882,10 @@ void BaseCallData::ReceiveMessage::WakeInsideCombiner(Flusher* flusher, "recv_message"); } if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ReceiveMessage.WakeInsideCombiner next complete: %s " - "new_state=%s", - base_->LogTag().c_str(), - p->has_value() ? "got message" : "end of stream", - StateString(state_)); + LOG(INFO) << base_->LogTag() + << " ReceiveMessage.WakeInsideCombiner next complete: " + << (p->has_value() ? "got message" : "end of stream") + << " new_state=" << StateString(state_); } } if (state_ != State::kPulledFromPipe && @@ -905,9 +899,8 @@ void BaseCallData::ReceiveMessage::WakeInsideCombiner(Flusher* flusher, CHECK(push_.has_value()); if ((*push_)().ready()) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ReceiveMessage.WakeInsideCombiner push complete", - base_->LogTag().c_str()); + LOG(INFO) << base_->LogTag() + << " ReceiveMessage.WakeInsideCombiner push complete"; } if (state_ == State::kCompletedWhilePulledFromPipe) { interceptor()->Push()->Close(); @@ -1021,8 +1014,8 @@ class ClientCallData::PollContext { void Run() { DCHECK(HasContext()); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ClientCallData.PollContext.Run %s", - self_->LogTag().c_str(), self_->DebugString().c_str()); + LOG(INFO) << self_->LogTag() << " ClientCallData.PollContext.Run " + << self_->DebugString(); } CHECK(have_scoped_activity_); repoll_ = false; @@ -1105,14 +1098,13 @@ class ClientCallData::PollContext { // Poll the promise once since we're waiting for it. Poll poll = self_->promise_(); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ClientCallData.PollContext.Run: poll=%s; %s", - self_->LogTag().c_str(), - PollToString(poll, - [](const ServerMetadataHandle& h) { - return h->DebugString(); - }) - .c_str(), - self_->DebugString().c_str()); + LOG(INFO) << self_->LogTag() + << " ClientCallData.PollContext.Run: poll=" + << PollToString(poll, + [](const ServerMetadataHandle& h) { + return h->DebugString(); + }) + << "; " << self_->DebugString(); } if (auto* r = poll.value_if_ready()) { auto md = std::move(*r); @@ -1316,7 +1308,7 @@ ClientCallData::~ClientCallData() { } std::string ClientCallData::DebugTag() const { - return absl::StrFormat("PBF_CLIENT[%p]: [%s] ", this, elem()->filter->name); + return absl::StrFormat("PBF_CLIENT[%p]: [%v] ", this, elem()->filter->name); } // Activity implementation. @@ -1385,8 +1377,7 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) { Flusher flusher(this); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s StartBatch %s", LogTag().c_str(), - DebugString().c_str()); + LOG(INFO) << LogTag() << " StartBatch " << DebugString(); } // If this is a cancel stream, cancel anything we have pending and propagate @@ -1509,8 +1500,7 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) { // Handle cancellation. void ClientCallData::Cancel(grpc_error_handle error, Flusher* flusher) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s Cancel error=%s", LogTag().c_str(), - error.ToString().c_str()); + LOG(INFO) << LogTag() << " Cancel error=" << error.ToString(); } // Track the latest reason for cancellation. cancelled_error_ = error; @@ -1589,10 +1579,9 @@ void ClientCallData::StartPromise(Flusher* flusher) { void ClientCallData::RecvInitialMetadataReady(grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ClientCallData.RecvInitialMetadataReady %s error:%s md:%s", - LogTag().c_str(), DebugString().c_str(), error.ToString().c_str(), - recv_initial_metadata_->metadata->DebugString().c_str()); + LOG(INFO) << LogTag() << " ClientCallData.RecvInitialMetadataReady " + << DebugString() << " error:" << error.ToString() + << " md:" << recv_initial_metadata_->metadata->DebugString(); } ScopedContext context(this); Flusher flusher(this); @@ -1673,8 +1662,8 @@ void ClientCallData::HookRecvTrailingMetadata(CapturedBatch batch) { ArenaPromise ClientCallData::MakeNextPromise( CallArgs call_args) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ClientCallData.MakeNextPromise %s", LogTag().c_str(), - DebugString().c_str()); + LOG(INFO) << LogTag() << " ClientCallData.MakeNextPromise " + << DebugString(); } CHECK_NE(poll_ctx_, nullptr); CHECK(send_initial_state_ == SendInitialState::kQueued); @@ -1736,8 +1725,8 @@ ArenaPromise ClientCallData::MakeNextPromise( // application. Poll ClientCallData::PollTrailingMetadata() { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ClientCallData.PollTrailingMetadata %s", - LogTag().c_str(), DebugString().c_str()); + LOG(INFO) << LogTag() << " ClientCallData.PollTrailingMetadata " + << DebugString(); } CHECK_NE(poll_ctx_, nullptr); if (send_initial_state_ == SendInitialState::kQueued) { @@ -1787,12 +1776,10 @@ void ClientCallData::RecvTrailingMetadataReadyCallback( void ClientCallData::RecvTrailingMetadataReady(grpc_error_handle error) { Flusher flusher(this); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s ClientCallData.RecvTrailingMetadataReady " - "recv_trailing_state=%s error=%s md=%s", - LogTag().c_str(), StateString(recv_trailing_state_), - error.ToString().c_str(), - recv_trailing_metadata_->DebugString().c_str()); + LOG(INFO) << LogTag() << " ClientCallData.RecvTrailingMetadataReady " + << "recv_trailing_state=" << StateString(recv_trailing_state_) + << " error=" << error + << " md=" << recv_trailing_metadata_->DebugString(); } // If we were cancelled prior to receiving this callback, we should simply // forward the callback up with the same error. @@ -2002,8 +1989,7 @@ ServerCallData::ServerCallData(grpc_call_element* elem, ServerCallData::~ServerCallData() { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s ~ServerCallData %s", LogTag().c_str(), - DebugString().c_str()); + LOG(INFO) << LogTag() << " ~ServerCallData " << DebugString(); } if (send_initial_metadata_ != nullptr) { send_initial_metadata_->~SendInitialMetadata(); @@ -2012,7 +1998,7 @@ ServerCallData::~ServerCallData() { } std::string ServerCallData::DebugTag() const { - return absl::StrFormat("PBF_SERVER[%p]: [%s] ", this, elem()->filter->name); + return absl::StrFormat("PBF_SERVER[%p]: [%v] ", this, elem()->filter->name); } // Activity implementation. @@ -2030,8 +2016,7 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) { bool wake = false; if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s StartBatch: %s", LogTag().c_str(), - DebugString().c_str()); + LOG(INFO) << LogTag() << " StartBatch: " << DebugString(); } // If this is a cancel stream, cancel anything we have pending and @@ -2164,15 +2149,13 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) { void ServerCallData::Completed(grpc_error_handle error, bool tarpit_cancellation, Flusher* flusher) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log( - GPR_DEBUG, - "%sServerCallData::Completed: send_trailing_state=%s " - "send_initial_state=%s error=%s", - LogTag().c_str(), StateString(send_trailing_state_), - send_initial_metadata_ == nullptr - ? "null" - : SendInitialMetadata::StateString(send_initial_metadata_->state), - error.ToString().c_str()); + VLOG(2) << LogTag() << "ServerCallData::Completed: send_trailing_state=" + << StateString(send_trailing_state_) << " send_initial_state=" + << (send_initial_metadata_ == nullptr + ? "null" + : SendInitialMetadata::StateString( + send_initial_metadata_->state)) + << " error=" << error; } // Track the latest reason for cancellation. cancelled_error_ = error; @@ -2290,8 +2273,8 @@ ArenaPromise ServerCallData::MakeNextPromise( // stack. Poll ServerCallData::PollTrailingMetadata() { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s PollTrailingMetadata: %s", LogTag().c_str(), - StateString(send_trailing_state_)); + LOG(INFO) << LogTag() + << " PollTrailingMetadata: " << StateString(send_trailing_state_); } switch (send_trailing_state_) { case SendTrailingState::kInitial: @@ -2321,9 +2304,8 @@ void ServerCallData::RecvTrailingMetadataReadyCallback( void ServerCallData::RecvTrailingMetadataReady(grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: RecvTrailingMetadataReady error=%s md=%s", - LogTag().c_str(), error.ToString().c_str(), - recv_trailing_metadata_->DebugString().c_str()); + LOG(INFO) << LogTag() << ": RecvTrailingMetadataReady error=" << error + << " md=" << recv_trailing_metadata_->DebugString(); } Flusher flusher(this); PollContext poll_ctx(this, &flusher); @@ -2341,8 +2323,7 @@ void ServerCallData::RecvInitialMetadataReadyCallback(void* arg, void ServerCallData::RecvInitialMetadataReady(grpc_error_handle error) { Flusher flusher(this); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: RecvInitialMetadataReady %s", LogTag().c_str(), - error.ToString().c_str()); + LOG(INFO) << LogTag() << ": RecvInitialMetadataReady " << error; } CHECK(recv_initial_state_ == RecvInitialState::kForwarded); // If there was an error we just propagate that through @@ -2406,8 +2387,7 @@ std::string ServerCallData::DebugString() const { void ServerCallData::WakeInsideCombiner(Flusher* flusher) { PollContext poll_ctx(this, flusher); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: WakeInsideCombiner %s", LogTag().c_str(), - DebugString().c_str()); + LOG(INFO) << LogTag() << ": WakeInsideCombiner " << DebugString(); } poll_ctx.ClearRepoll(); if (send_initial_metadata_ != nullptr) { @@ -2429,13 +2409,11 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { if (send_initial_metadata_->metadata_push_.has_value()) { if ((*send_initial_metadata_->metadata_push_)().ready()) { if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: WakeInsideCombiner: metadata_push done", - LogTag().c_str()); + LOG(INFO) << LogTag() << ": WakeInsideCombiner: metadata_push done"; } send_initial_metadata_->metadata_push_.reset(); } else if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, "%s: WakeInsideCombiner: metadata_push pending", - LogTag().c_str()); + LOG(INFO) << LogTag() << ": WakeInsideCombiner: metadata_push pending"; } } } @@ -2452,12 +2430,9 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { send_initial_metadata_ == nullptr || send_initial_metadata_->state == SendInitialMetadata::kForwarded); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_DEBUG, - "%s: After send_message WakeInsideCombiner %s is_idle=%s " - "is_forwarded=%s", - LogTag().c_str(), DebugString().c_str(), - send_message()->IsIdle() ? "true" : "false", - send_message()->IsForwarded() ? "true" : "false"); + VLOG(2) << LogTag() << ": After send_message WakeInsideCombiner " + << DebugString() << " is_idle=" << send_message()->IsIdle() + << " is_forwarded=" << send_message()->IsForwarded(); } if (send_trailing_state_ == SendTrailingState::kQueuedBehindSendMessage && (send_message()->IsIdle() || @@ -2481,19 +2456,19 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { Poll poll; poll = promise_(); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log( - GPR_INFO, - "%s: WakeInsideCombiner poll=%s; send_initial_metadata=%s " - "send_trailing_metadata=%s", - LogTag().c_str(), - PollToString( - poll, - [](const ServerMetadataHandle& h) { return h->DebugString(); }) - .c_str(), - send_initial_metadata_ == nullptr - ? "null" - : SendInitialMetadata::StateString(send_initial_metadata_->state), - StateString(send_trailing_state_)); + LOG(INFO) << LogTag() << ": WakeInsideCombiner poll=" + << PollToString(poll, + [](const ServerMetadataHandle& h) { + return h->DebugString(); + }) + .c_str() + << "; send_initial_metadata=" + << (send_initial_metadata_ == nullptr + ? "null" + : SendInitialMetadata::StateString( + send_initial_metadata_->state)) + << " send_trailing_metadata=" + << StateString(send_trailing_state_); } if (send_initial_metadata_ != nullptr && send_initial_metadata_->state == @@ -2501,12 +2476,12 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) { CHECK(send_initial_metadata_->metadata_next_.has_value()); auto p = (*send_initial_metadata_->metadata_next_)(); if (GRPC_TRACE_FLAG_ENABLED(channel)) { - gpr_log(GPR_INFO, - "%s: WakeInsideCombiner send_initial_metadata poll=%s", - LogTag().c_str(), - PollToString(p, [](const NextResult& h) { - return (*h)->DebugString(); - }).c_str()); + LOG(INFO) << LogTag() + << ": WakeInsideCombiner send_initial_metadata poll=" + << PollToString( + p, [](const NextResult& h) { + return (*h)->DebugString(); + }); } if (auto* nr = p.value_if_ready()) { ServerMetadataHandle md = std::move(nr->value()); diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index c40b1fb096..1600697024 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -150,16 +150,6 @@ class ChannelFilter { virtual bool GetChannelInfo(const grpc_channel_info*) { return false; } virtual ~ChannelFilter() = default; - - grpc_event_engine::experimental::EventEngine* - hack_until_per_channel_stack_event_engines_land_get_event_engine() { - return event_engine_.get(); - } - - private: - // TODO(ctiller): remove once per-channel-stack EventEngines land - std::shared_ptr event_engine_ = - grpc_event_engine::experimental::GetDefaultEventEngine(); }; namespace promise_filter_detail { @@ -953,9 +943,8 @@ class BaseCallData : public Activity, private Wakeable { : promise_detail::Context(call_data->arena_), promise_detail::Context( call_data->pollent_.load(std::memory_order_acquire)), - promise_detail::Context(&call_data->finalization_), - promise_detail::Context( - call_data->event_engine_) {} + promise_detail::Context(&call_data->finalization_) { + } }; class Flusher { @@ -1305,7 +1294,6 @@ class BaseCallData : public Activity, private Wakeable { Pipe* const server_initial_metadata_pipe_; SendMessage* const send_message_; ReceiveMessage* const receive_message_; - grpc_event_engine::experimental::EventEngine* event_engine_; }; class ClientCallData : public BaseCallData { @@ -1659,7 +1647,7 @@ template absl::enable_if_t::value && !std::is_base_of::value, grpc_channel_filter> -MakePromiseBasedFilter(const char* name) { +MakePromiseBasedFilter() { using CallData = promise_filter_detail::CallData; return grpc_channel_filter{ @@ -1690,14 +1678,14 @@ MakePromiseBasedFilter(const char* name) { // get_channel_info promise_filter_detail::ChannelFilterMethods::GetChannelInfo, // name - name, + UniqueTypeNameFor(), }; } template absl::enable_if_t::value, grpc_channel_filter> -MakePromiseBasedFilter(const char* name) { +MakePromiseBasedFilter() { using CallData = promise_filter_detail::CallData; return grpc_channel_filter{ @@ -1728,7 +1716,7 @@ MakePromiseBasedFilter(const char* name) { // get_channel_info promise_filter_detail::ChannelFilterMethods::GetChannelInfo, // name - name, + UniqueTypeNameFor(), }; } diff --git a/src/core/lib/compression/compression.cc b/src/core/lib/compression/compression.cc index d3aa887846..018e92a379 100644 --- a/src/core/lib/compression/compression.cc +++ b/src/core/lib/compression/compression.cc @@ -29,7 +29,6 @@ #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/surface/api_trace.h" #include "src/core/util/useful.h" int grpc_compression_algorithm_is_message(grpc_compression_algorithm) { @@ -54,8 +53,9 @@ int grpc_compression_algorithm_parse(grpc_slice name, int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm, const char** name) { - GRPC_API_TRACE("grpc_compression_algorithm_name(algorithm=%d, name=%p)", 2, - ((int)algorithm, name)); + GRPC_TRACE_LOG(api, INFO) + << "grpc_compression_algorithm_name(algorithm=" << (int)algorithm + << ", name=" << name << ")"; const char* result = grpc_core::CompressionAlgorithmAsString(algorithm); if (result != nullptr) { *name = result; diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index e26369ad27..9fb7a7956a 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -62,17 +62,17 @@ static int zlib_body(z_stream* zs, grpc_slice_buffer* input, } r = flate(zs, flush); if (r < 0 && r != Z_BUF_ERROR /* not fatal */) { - LOG(INFO) << "zlib error (" << r << ")"; + VLOG(2) << "zlib error (" << r << ")"; goto error; } } while (zs->avail_out == 0); if (zs->avail_in) { - LOG(INFO) << "zlib: not all input consumed"; + VLOG(2) << "zlib: not all input consumed"; goto error; } } if (r != Z_STREAM_END) { - LOG(INFO) << "zlib: Data error"; + VLOG(2) << "zlib: Data error"; goto error; } diff --git a/src/core/lib/config/config_vars.cc b/src/core/lib/config/config_vars.cc index b3a919b117..c1bba0e4aa 100644 --- a/src/core/lib/config/config_vars.cc +++ b/src/core/lib/config/config_vars.cc @@ -26,7 +26,7 @@ #include "src/core/lib/config/load_config.h" #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING -#define GPR_DEFAULT_LOG_VERBOSITY_STRING "ERROR" +#define GPR_DEFAULT_LOG_VERBOSITY_STRING "" #endif // !GPR_DEFAULT_LOG_VERBOSITY_STRING #ifdef GRPC_ENABLE_FORK_SUPPORT @@ -55,9 +55,6 @@ ABSL_FLAG(std::vector, grpc_trace, {}, "into how gRPC C core is processing requests via debug logs."); ABSL_FLAG(absl::optional, grpc_verbosity, {}, "Logging verbosity."); -ABSL_FLAG(absl::optional, grpc_stacktrace_minloglevel, {}, - "Messages logged at the same or higher level than this will print " - "stacktrace"); ABSL_FLAG(absl::optional, grpc_enable_fork_support, {}, "Enable fork support"); ABSL_FLAG(absl::optional, grpc_poll_strategy, {}, @@ -97,9 +94,6 @@ ConfigVars::ConfigVars(const Overrides& overrides) verbosity_(LoadConfig(FLAGS_grpc_verbosity, "GRPC_VERBOSITY", overrides.verbosity, GPR_DEFAULT_LOG_VERBOSITY_STRING)), - stacktrace_minloglevel_(LoadConfig(FLAGS_grpc_stacktrace_minloglevel, - "GRPC_STACKTRACE_MINLOGLEVEL", - overrides.stacktrace_minloglevel, "")), poll_strategy_(LoadConfig(FLAGS_grpc_poll_strategy, "GRPC_POLL_STRATEGY", overrides.poll_strategy, "all")), ssl_cipher_suites_(LoadConfig( @@ -134,8 +128,7 @@ std::string ConfigVars::ToString() const { ClientChannelBackupPollIntervalMs(), ", dns_resolver: ", "\"", absl::CEscape(DnsResolver()), "\"", ", trace: ", "\"", absl::CEscape(Trace()), "\"", ", verbosity: ", "\"", - absl::CEscape(Verbosity()), "\"", ", stacktrace_minloglevel: ", "\"", - absl::CEscape(StacktraceMinloglevel()), "\"", + absl::CEscape(Verbosity()), "\"", ", enable_fork_support: ", EnableForkSupport() ? "true" : "false", ", poll_strategy: ", "\"", absl::CEscape(PollStrategy()), "\"", ", abort_on_leaks: ", AbortOnLeaks() ? "true" : "false", diff --git a/src/core/lib/config/config_vars.h b/src/core/lib/config/config_vars.h index d368df239e..a9410d9b76 100644 --- a/src/core/lib/config/config_vars.h +++ b/src/core/lib/config/config_vars.h @@ -40,7 +40,6 @@ class GPR_DLL ConfigVars { absl::optional not_use_system_ssl_roots; absl::optional dns_resolver; absl::optional verbosity; - absl::optional stacktrace_minloglevel; absl::optional poll_strategy; absl::optional system_ssl_roots_dir; absl::optional default_ssl_roots_file_path; @@ -81,10 +80,6 @@ class GPR_DLL ConfigVars { absl::string_view Trace() const { return trace_; } // Logging verbosity. absl::string_view Verbosity() const { return verbosity_; } - // Messages logged at the same or higher level than this will print stacktrace - absl::string_view StacktraceMinloglevel() const { - return stacktrace_minloglevel_; - } // Enable fork support bool EnableForkSupport() const { return enable_fork_support_; } // Declares which polling engines to try when starting gRPC. This is a @@ -113,7 +108,6 @@ class GPR_DLL ConfigVars { bool not_use_system_ssl_roots_; std::string dns_resolver_; std::string verbosity_; - std::string stacktrace_minloglevel_; std::string poll_strategy_; std::string ssl_cipher_suites_; std::string experiments_; diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index 78b79eb968..642976a0e6 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -30,7 +30,6 @@ #include "absl/strings/strip.h" #include -#include #include #include "src/core/lib/config/config_vars.h" @@ -41,7 +40,7 @@ int grpc_tracer_set_enabled(const char* name, int enabled); namespace grpc_core { namespace { void LogAllTracers() { - gpr_log(GPR_DEBUG, "available tracers:"); + VLOG(2) << "available tracers:"; for (const auto& name : GetAllTraceFlags()) { LOG(INFO) << " " << name.first; } diff --git a/src/core/lib/debug/trace_flags.cc b/src/core/lib/debug/trace_flags.cc index 05ef50af0e..f3fa6c6331 100644 --- a/src/core/lib/debug/trace_flags.cc +++ b/src/core/lib/debug/trace_flags.cc @@ -26,6 +26,7 @@ namespace grpc_core { DebugOnlyTraceFlag auth_context_refcount_trace(false, "auth_context_refcount"); DebugOnlyTraceFlag call_combiner_trace(false, "call_combiner"); DebugOnlyTraceFlag call_refcount_trace(false, "call_refcount"); +DebugOnlyTraceFlag call_state_trace(false, "call_state"); DebugOnlyTraceFlag closure_trace(false, "closure"); DebugOnlyTraceFlag combiner_trace(false, "combiner"); DebugOnlyTraceFlag cq_refcount_trace(false, "cq_refcount"); @@ -229,6 +230,7 @@ const absl::flat_hash_map& GetAllTraceFlags() { {"auth_context_refcount", &auth_context_refcount_trace}, {"call_combiner", &call_combiner_trace}, {"call_refcount", &call_refcount_trace}, + {"call_state", &call_state_trace}, {"closure", &closure_trace}, {"combiner", &combiner_trace}, {"cq_refcount", &cq_refcount_trace}, diff --git a/src/core/lib/debug/trace_flags.h b/src/core/lib/debug/trace_flags.h index 65d59df507..4aaf5e0111 100644 --- a/src/core/lib/debug/trace_flags.h +++ b/src/core/lib/debug/trace_flags.h @@ -26,6 +26,7 @@ namespace grpc_core { extern DebugOnlyTraceFlag auth_context_refcount_trace; extern DebugOnlyTraceFlag call_combiner_trace; extern DebugOnlyTraceFlag call_refcount_trace; +extern DebugOnlyTraceFlag call_state_trace; extern DebugOnlyTraceFlag closure_trace; extern DebugOnlyTraceFlag combiner_trace; extern DebugOnlyTraceFlag cq_refcount_trace; diff --git a/src/core/lib/debug/trace_impl.h b/src/core/lib/debug/trace_impl.h index 705e2bbe57..45d4f8cba4 100644 --- a/src/core/lib/debug/trace_impl.h +++ b/src/core/lib/debug/trace_impl.h @@ -25,6 +25,10 @@ #include +#ifdef _WIN32 +#undef ERROR +#endif + void grpc_tracer_init(); void grpc_tracer_shutdown(void); diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index 7fb665d744..a02f11b3f3 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -65,6 +65,7 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/config/config_vars.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/grpc_polled_fd.h" #include "src/core/lib/event_engine/time_util.h" @@ -788,4 +789,50 @@ void (*event_engine_grpc_ares_test_only_inject_config)(ares_channel* channel) = bool g_event_engine_grpc_ares_test_only_force_tcp = false; +bool ShouldUseAresDnsResolver() { +#if defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) || \ + defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) + auto resolver_env = grpc_core::ConfigVars::Get().DnsResolver(); + return resolver_env.empty() || absl::EqualsIgnoreCase(resolver_env, "ares"); +#else // defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) || + // defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) + return false; +#endif // defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) || + // defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) +} + +absl::Status AresInit() { + if (ShouldUseAresDnsResolver()) { + address_sorting_init(); + // ares_library_init and ares_library_cleanup are currently no-op except + // under Windows. Calling them may cause race conditions when other parts of + // the binary calls these functions concurrently. +#ifdef GPR_WINDOWS + int status = ares_library_init(ARES_LIB_INIT_ALL); + if (status != ARES_SUCCESS) { + return GRPC_ERROR_CREATE( + absl::StrCat("ares_library_init failed: ", ares_strerror(status))); + } +#endif // GPR_WINDOWS + } + return absl::OkStatus(); +} +void AresShutdown() { + if (ShouldUseAresDnsResolver()) { + address_sorting_shutdown(); + // ares_library_init and ares_library_cleanup are currently no-op except + // under Windows. Calling them may cause race conditions when other parts of + // the binary calls these functions concurrently. +#ifdef GPR_WINDOWS + ares_library_cleanup(); +#endif // GPR_WINDOWS + } +} + +#else // GRPC_ARES == 1 + +bool ShouldUseAresDnsResolver() { return false; } +absl::Status AresInit() { return absl::OkStatus(); } +void AresShutdown() {} + #endif // GRPC_ARES == 1 diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h index b0e1f3c06c..68812e59a4 100644 --- a/src/core/lib/event_engine/ares_resolver.h +++ b/src/core/lib/event_engine/ares_resolver.h @@ -16,6 +16,8 @@ #include +#include "absl/status/status.h" + #include #include "src/core/lib/debug/trace.h" @@ -29,7 +31,6 @@ #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" -#include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" @@ -46,11 +47,12 @@ namespace grpc_event_engine { namespace experimental { -#define GRPC_ARES_RESOLVER_TRACE_LOG(format, ...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(cares_resolver)) { \ - gpr_log(GPR_INFO, "(EventEngine c-ares resolver) " format, __VA_ARGS__); \ - } \ +#define GRPC_ARES_RESOLVER_TRACE_LOG(format, ...) \ + do { \ + if (GRPC_TRACE_FLAG_ENABLED(cares_resolver)) { \ + LOG(INFO) << "(EventEngine c-ares resolver) " \ + << absl::StrFormat(format, __VA_ARGS__); \ + } \ } while (0) class AresResolver : public RefCountedDNSResolverInterface { @@ -146,4 +148,9 @@ extern void (*event_engine_grpc_ares_test_only_inject_config)( extern bool g_event_engine_grpc_ares_test_only_force_tcp; #endif // GRPC_ARES == 1 + +bool ShouldUseAresDnsResolver(); +absl::Status AresInit(); +void AresShutdown(); + #endif // GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.cc b/src/core/lib/event_engine/cf_engine/cf_engine.cc index 83f4a57aca..ffd936cd51 100644 --- a/src/core/lib/event_engine/cf_engine/cf_engine.cc +++ b/src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -21,6 +21,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include @@ -30,7 +31,6 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/utils.h" #include "src/core/lib/gprpp/crash.h" @@ -44,8 +44,8 @@ struct CFEventEngine::Closure final : public EventEngine::Closure { EventEngine::TaskHandle handle; void Run() override { - GRPC_EVENT_ENGINE_TRACE("CFEventEngine:%p executing callback:%s", engine, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "CFEventEngine:" << engine << " executing callback:" << handle; { grpc_core::MutexLock lock(&engine->task_mu_); engine->known_handles_.erase(handle); @@ -65,9 +65,9 @@ CFEventEngine::~CFEventEngine() { grpc_core::MutexLock lock(&task_mu_); if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { for (auto handle : known_handles_) { - gpr_log(GPR_ERROR, - "CFEventEngine:%p uncleared TaskHandle at shutdown:%s", this, - HandleToString(handle).c_str()); + LOG(ERROR) << "CFEventEngine:" << this + << " uncleared TaskHandle at shutdown:" + << HandleToString(handle); } } CHECK(GPR_LIKELY(known_handles_.empty())); @@ -145,9 +145,8 @@ bool CFEventEngine::CancelConnectInternal(ConnectionHandle handle, grpc_core::MutexLock lock(&conn_mu_); if (!conn_handles_.contains(handle)) { - GRPC_EVENT_ENGINE_TRACE( - "Unknown connection handle: %s", - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "Unknown connection handle: " << handle; return false; } conn_handles_.erase(handle); @@ -210,8 +209,8 @@ EventEngine::TaskHandle CFEventEngine::RunAfterInternal( grpc_core::MutexLock lock(&task_mu_); known_handles_.insert(handle); cd->handle = handle; - GRPC_EVENT_ENGINE_TRACE("CFEventEngine:%p scheduling callback:%s", this, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "CFEventEngine:" << this << " scheduling callback:" << handle; timer_manager_.TimerInit(&cd->timer, when_ts, cd); return handle; } diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc index a2307fe36f..337a5bc5a2 100644 --- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc @@ -23,7 +23,6 @@ #include "absl/strings/str_format.h" #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/strerror.h" namespace grpc_event_engine { @@ -68,9 +67,9 @@ absl::StatusOr CFReadStreamLocallAddress( } // namespace bool CFStreamEndpointImpl::CancelConnect(absl::Status status) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "CFStreamEndpointImpl::CancelConnect: status: %s, this: %p", - status.ToString().c_str(), this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::CancelConnect: status: " << status + << ", this: " << this; return open_event_.SetShutdown(std::move(status)); } @@ -85,8 +84,8 @@ void CFStreamEndpointImpl::Connect( return; } - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::Connect: %s", - addr_uri.value().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Connect: " << addr_uri.value(); peer_address_ = std::move(addr); auto host_port = ResolvedAddressToNormalizedString(peer_address_); @@ -96,8 +95,8 @@ void CFStreamEndpointImpl::Connect( } peer_address_string_ = host_port.value(); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "CFStreamEndpointImpl::Connect, host_port: %s", host_port->c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Connect, host_port: " << peer_address_string_; std::string host_string; std::string port_string; @@ -163,8 +162,9 @@ void CFStreamEndpointImpl::Connect( void* client_callback_info) { auto self = static_cast(client_callback_info); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "CFStreamEndpointImpl::ReadCallback, type: %lu, this: %p", type, self); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::ReadCallback, type: " << type + << ", this: " << self; switch (type) { case kCFStreamEventOpenCompleted: @@ -177,8 +177,8 @@ void CFStreamEndpointImpl::Connect( break; case kCFStreamEventErrorOccurred: { auto status = CFErrorToStatus(CFReadStreamCopyError(stream)); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStream Read error: %s", - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStream Read error: " << status; self->open_event_.SetShutdown(status); self->read_event_.SetShutdown(status); @@ -194,8 +194,9 @@ void CFStreamEndpointImpl::WriteCallback(CFWriteStreamRef stream, CFStreamEventType type, void* client_callback_info) { auto self = static_cast(client_callback_info); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "CFStreamEndpointImpl::WriteCallback, type: %lu, this: %p", type, self); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::WriteCallback, type: " << type + << ", this: " << self; switch (type) { case kCFStreamEventOpenCompleted: @@ -208,8 +209,8 @@ void CFStreamEndpointImpl::WriteCallback(CFWriteStreamRef stream, break; case kCFStreamEventErrorOccurred: { auto status = CFErrorToStatus(CFWriteStreamCopyError(stream)); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStream Write error: %s", - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStream Write error: " << status; self->open_event_.SetShutdown(status); self->read_event_.SetShutdown(status); @@ -239,8 +240,8 @@ CFStreamEndpointImpl::~CFStreamEndpointImpl() { } void CFStreamEndpointImpl::Shutdown() { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::Shutdown: this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Shutdown: this: " << this; auto shutdownStatus = absl::Status(absl::StatusCode::kUnknown, @@ -259,8 +260,8 @@ void CFStreamEndpointImpl::Shutdown() { bool CFStreamEndpointImpl::Read( absl::AnyInvocable on_read, SliceBuffer* buffer, const EventEngine::Endpoint::ReadArgs* /* args */) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::Read, this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Read, this: " << this; read_event_.NotifyOn(new PosixEngineClosure( [that = Ref(), on_read = std::move(on_read), @@ -278,8 +279,8 @@ bool CFStreamEndpointImpl::Read( void CFStreamEndpointImpl::DoRead( absl::AnyInvocable on_read, SliceBuffer* buffer) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::DoRead, this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::DoRead, this: " << this; auto buffer_index = buffer->AppendIndexed( Slice(memory_allocator_.MakeSlice(kDefaultReadBufferSize))); @@ -292,8 +293,8 @@ void CFStreamEndpointImpl::DoRead( if (read_size < 0) { auto status = CFErrorToStatus(CFReadStreamCopyError(cf_read_stream_)); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStream read error: %s, read_size: %ld", - status.ToString().c_str(), read_size); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStream read error: " << status << ", read_size: " << read_size; on_read(status); return; } @@ -305,8 +306,8 @@ void CFStreamEndpointImpl::DoRead( bool CFStreamEndpointImpl::Write( absl::AnyInvocable on_writable, SliceBuffer* data, const EventEngine::Endpoint::WriteArgs* /* args */) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::Write, this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::Write, this: " << this; write_event_.NotifyOn(new PosixEngineClosure( [that = Ref(), on_writable = std::move(on_writable), @@ -324,8 +325,8 @@ bool CFStreamEndpointImpl::Write( void CFStreamEndpointImpl::DoWrite( absl::AnyInvocable on_writable, SliceBuffer* data) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("CFStreamEndpointImpl::DoWrite, this: %p", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "CFStreamEndpointImpl::DoWrite, this: " << this; size_t total_written_size = 0; for (size_t i = 0; i < data->Count(); i++) { diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc index 3a8ade4ed0..8c0cd0b694 100644 --- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc +++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc @@ -26,7 +26,6 @@ #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h" #include "src/core/lib/event_engine/posix_engine/lockfree_event.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/host_port.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc index 743b788c72..45520f581e 100644 --- a/src/core/lib/event_engine/default_event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -26,7 +26,6 @@ #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine_factory.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/gprpp/sync.h" @@ -79,15 +78,15 @@ std::shared_ptr GetDefaultEventEngine( grpc_core::SourceLocation location) { grpc_core::MutexLock lock(&*g_mu); if (std::shared_ptr engine = g_event_engine->lock()) { - GRPC_EVENT_ENGINE_TRACE( - "Returning existing EventEngine::%p. use_count:%ld. Called from " - "[%s:%d]", - engine.get(), engine.use_count(), location.file(), location.line()); + GRPC_TRACE_LOG(event_engine, INFO) + << "Returning existing EventEngine::" << engine.get() + << ". use_count:" << engine.use_count() << ". Called from " << location; return engine; } std::shared_ptr engine{CreateEventEngine()}; - GRPC_EVENT_ENGINE_TRACE("Created DefaultEventEngine::%p. Called from [%s:%d]", - engine.get(), location.file(), location.line()); + GRPC_TRACE_LOG(event_engine, INFO) + << "Created DefaultEventEngine::" << engine.get() << ". Called from " + << location; *g_event_engine = engine; return engine; } diff --git a/src/core/lib/event_engine/event_engine.cc b/src/core/lib/event_engine/event_engine.cc index 74f24fdc9c..5a162f871a 100644 --- a/src/core/lib/event_engine/event_engine.cc +++ b/src/core/lib/event_engine/event_engine.cc @@ -23,6 +23,13 @@ const EventEngine::TaskHandle EventEngine::TaskHandle::kInvalid = {-1, -1}; const EventEngine::ConnectionHandle EventEngine::ConnectionHandle::kInvalid = { -1, -1}; +namespace detail { +std::string FormatHandleString(uint64_t key1, uint64_t key2) { + return absl::StrCat("{", absl::Hex(key1, absl::kZeroPad16), ",", + absl::Hex(key2, absl::kZeroPad16), "}"); +} +} // namespace detail + namespace { template bool eq(const T& lhs, const T& rhs) { @@ -30,8 +37,7 @@ bool eq(const T& lhs, const T& rhs) { } template std::ostream& printout(std::ostream& out, const T& handle) { - out << absl::StrCat("{", absl::Hex(handle.keys[0], absl::kZeroPad16), ",", - absl::Hex(handle.keys[1], absl::kZeroPad16), "}"); + out << detail::FormatHandleString(handle.keys[0], handle.keys[1]); return out; } } // namespace diff --git a/src/core/lib/event_engine/event_engine_context.h b/src/core/lib/event_engine/event_engine_context.h index f14a6e8112..c49f8332b4 100644 --- a/src/core/lib/event_engine/event_engine_context.h +++ b/src/core/lib/event_engine/event_engine_context.h @@ -18,12 +18,14 @@ #include #include -#include "src/core/lib/promise/context.h" +#include "src/core/lib/resource_quota/arena.h" namespace grpc_core { template <> -struct ContextType {}; +struct ArenaContextType { + static void Destroy(grpc_event_engine::experimental::EventEngine*) {} +}; } // namespace grpc_core diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc index 682a13d2b6..c990fe4023 100644 --- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc @@ -356,7 +356,8 @@ Epoll1Poller::Epoll1Poller(Scheduler* scheduler) wakeup_fd_ = *CreateWakeupFd(); CHECK(wakeup_fd_ != nullptr); CHECK_GE(g_epoll_set_.epfd, 0); - LOG(INFO) << "grpc epoll fd: " << g_epoll_set_.epfd; + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "grpc epoll fd: " << g_epoll_set_.epfd; struct epoll_event ev; ev.events = static_cast(EPOLLIN | EPOLLET); ev.data.ptr = wakeup_fd_.get(); diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc index 708c8cee82..034149964e 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -39,11 +39,11 @@ #include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/load_file.h" @@ -564,7 +564,8 @@ void PosixEndpointImpl::HandleRead(absl::Status status) { grpc_core::MutexLock lock(&read_mu_); ret = HandleReadLocked(status); if (ret) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Read complete", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Read complete"; cb = std::move(read_cb_); read_cb_ = nullptr; incoming_buffer_ = nullptr; @@ -582,7 +583,8 @@ bool PosixEndpointImpl::Read(absl::AnyInvocable on_read, SliceBuffer* buffer, const EventEngine::Endpoint::ReadArgs* args) { grpc_core::ReleasableMutexLock lock(&read_mu_); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Read", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Read"; CHECK(read_cb_ == nullptr); incoming_buffer_ = buffer; incoming_buffer_->Clear(); @@ -624,9 +626,8 @@ bool PosixEndpointImpl::Read(absl::AnyInvocable on_read, // asynchronously. lock.Release(); engine_->Run([on_read = std::move(on_read), status, this]() mutable { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "Endpoint[%p]: Read failed immediately: %s", this, - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Read failed immediately: " << status; on_read(status); }); Unref(); @@ -636,8 +637,8 @@ bool PosixEndpointImpl::Read(absl::AnyInvocable on_read, // callback. incoming_buffer_ = nullptr; Unref(); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Read succeeded immediately", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Read succeeded immediately"; return true; } return false; @@ -969,15 +970,15 @@ bool PosixEndpointImpl::DoFlushZerocopy(TcpZerocopySendRecord* record, handle_->SetWritable(); } else { #ifdef GRPC_LINUX_ERRQUEUE - GRPC_LOG_EVERY_N_SEC( - 1, GPR_INFO, - "Tx0cp encountered an ENOBUFS error possibly because one or " - "both of RLIMIT_MEMLOCK or hard memlock ulimit values are too " - "small for the intended user. Current system value of " - "RLIMIT_MEMLOCK is %" PRIu64 " and hard memlock ulimit is %" PRIu64 - ".Consider increasing these values appropriately for the intended " - "user.", - GetRLimitMemLockMax(), GetUlimitHardMemLock()); + LOG_EVERY_N_SEC(INFO, 1) + << "Tx0cp encountered an ENOBUFS error possibly because one or " + "both of RLIMIT_MEMLOCK or hard memlock ulimit values are too " + "small for the intended user. Current system value of " + "RLIMIT_MEMLOCK is " + << GetRLimitMemLockMax() << " and hard memlock ulimit is " + << GetUlimitHardMemLock() + << ".Consider increasing these values appropriately for the " + "intended user."; #endif } } @@ -1111,8 +1112,8 @@ bool PosixEndpointImpl::TcpFlush(absl::Status& status) { void PosixEndpointImpl::HandleWrite(absl::Status status) { if (!status.ok()) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write failed: %s", this, - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write failed: " << status; absl::AnyInvocable cb_ = std::move(write_cb_); write_cb_ = nullptr; if (current_zerocopy_send_ != nullptr) { @@ -1130,8 +1131,8 @@ void PosixEndpointImpl::HandleWrite(absl::Status status) { DCHECK(status.ok()); handle_->NotifyOnWrite(on_write_); } else { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write complete: %s", this, - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write complete: " << status; absl::AnyInvocable cb_ = std::move(write_cb_); write_cb_ = nullptr; current_zerocopy_send_ = nullptr; @@ -1150,8 +1151,8 @@ bool PosixEndpointImpl::Write( DCHECK_EQ(current_zerocopy_send_, nullptr); DCHECK_NE(data, nullptr); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write %" PRIdPTR " bytes", - this, data->Length()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write " << data->Length() << " bytes"; if (data->Length() == 0) { TcpShutdownTracedBufferList(); @@ -1159,13 +1160,14 @@ bool PosixEndpointImpl::Write( status = TcpAnnotateError(absl::InternalError("EOF")); engine_->Run( [on_writable = std::move(on_writable), status, this]() mutable { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write failed: %s", - this, status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write failed: " << status; on_writable(status); }); return false; } - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write skipped", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write skipped"; return true; } @@ -1197,16 +1199,16 @@ bool PosixEndpointImpl::Write( // asynchronously. engine_->Run( [on_writable = std::move(on_writable), status, this]() mutable { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write failed: %s", - this, status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write failed: " << status; on_writable(status); }); return false; } // Write succeeded immediately. Return true and don't run the on_writable // callback. - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Endpoint[%p]: Write succeded immediately", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Endpoint[" << this << "]: Write succeded immediately"; return true; } @@ -1295,9 +1297,9 @@ PosixEndpointImpl::PosixEndpointImpl(EventHandle* handle, } if (zerocopy_enabled) { - LOG(INFO) << "Tx-zero copy enabled for gRPC sends. RLIMIT_MEMLOCK value " - << "=" << GetRLimitMemLockMax() - << ",ulimit hard memlock value = " << GetUlimitHardMemLock(); + VLOG(2) << "Tx-zero copy enabled for gRPC sends. RLIMIT_MEMLOCK value " + << "=" << GetRLimitMemLockMax() + << ",ulimit hard memlock value = " << GetUlimitHardMemLock(); } } #endif // GRPC_LINUX_ERRQUEUE diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.h b/src/core/lib/event_engine/posix_engine/posix_endpoint.h index 3e919857d2..0c42a5467c 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.h +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.h @@ -184,7 +184,7 @@ class TcpZerocopySendCtx { if (send_records_ == nullptr || free_send_records_ == nullptr) { gpr_free(send_records_); gpr_free(free_send_records_); - LOG(INFO) << "Disabling TCP TX zerocopy due to memory pressure.\n"; + VLOG(2) << "Disabling TCP TX zerocopy due to memory pressure.\n"; memory_limited_ = true; enabled_ = false; } else { diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc index ac73908323..7dfc253562 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -35,10 +35,8 @@ #include #include #include -#include #include -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/forkable.h" @@ -50,7 +48,6 @@ #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/posix_engine/timer.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/utils.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/no_destruct.h" @@ -95,15 +92,6 @@ class TimerForkCallbackMethods { static void PostforkChild() { g_timer_fork_manager->PostforkChild(); } }; -bool ShouldUseAresDnsResolver() { -#if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) - auto resolver_env = grpc_core::ConfigVars::Get().DnsResolver(); - return resolver_env.empty() || absl::EqualsIgnoreCase(resolver_env, "ares"); -#else // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) - return false; -#endif // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER) -} - } // namespace #ifdef GRPC_POSIX_SOCKET_TCP @@ -446,8 +434,8 @@ struct PosixEventEngine::ClosureData final : public EventEngine::Closure { EventEngine::TaskHandle handle; void Run() override { - GRPC_EVENT_ENGINE_TRACE("PosixEventEngine:%p executing callback:%s", engine, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "PosixEventEngine:" << engine << " executing callback:" << handle; { grpc_core::MutexLock lock(&engine->mu_); engine->known_handles_.erase(handle); @@ -462,11 +450,9 @@ PosixEventEngine::~PosixEventEngine() { grpc_core::MutexLock lock(&mu_); if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { for (auto handle : known_handles_) { - gpr_log(GPR_ERROR, - "(event_engine) PosixEventEngine:%p uncleared " - "TaskHandle at " - "shutdown:%s", - this, HandleToString(handle).c_str()); + LOG(ERROR) << "(event_engine) PosixEventEngine:" << this + << " uncleared TaskHandle at shutdown:" + << HandleToString(handle); } } CHECK(GPR_LIKELY(known_handles_.empty())); @@ -523,8 +509,8 @@ EventEngine::TaskHandle PosixEventEngine::RunAfterInternal( grpc_core::MutexLock lock(&mu_); known_handles_.insert(handle); cd->handle = handle; - GRPC_EVENT_ENGINE_TRACE("PosixEventEngine:%p scheduling callback:%s", this, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "PosixEventEngine:" << this << " scheduling callback:" << handle; timer_manager_->TimerInit(&cd->timer, when_ts, cd); return handle; } diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc index f81f57b528..fcc98fe4c8 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc @@ -40,12 +40,12 @@ #include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h" #include "src/core/lib/event_engine/posix_engine/posix_engine_listener.h" #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/status_helper.h" #include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/gprpp/time.h" @@ -127,8 +127,8 @@ void PosixEngineListenerImpl::AsyncConnectionAcceptor::Start() { void PosixEngineListenerImpl::AsyncConnectionAcceptor::NotifyOnAccept( absl::Status status) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("Acceptor[%p]: NotifyOnAccept: %s", this, - status.ToString().c_str()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Acceptor[" << this << "]: NotifyOnAccept: " << status; if (!status.ok()) { // Shutting down the acceptor. Unref the ref grabbed in // AsyncConnectionAcceptor::Start(). diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc index 0f47a26102..7aa624fc3c 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc @@ -345,14 +345,14 @@ absl::StatusOr ListenerContainerAddWildcardAddresses( } if (assigned_port > 0) { if (!v6_sock.ok()) { - LOG(INFO) << "Failed to add :: listener, the environment may not support " - "IPv6: " - << v6_sock.status(); + VLOG(2) << "Failed to add :: listener, the environment may not support " + "IPv6: " + << v6_sock.status(); } if (!v4_sock.ok()) { - LOG(INFO) << "Failed to add 0.0.0.0 listener, " - "the environment may not support IPv4: " - << v4_sock.status(); + VLOG(2) << "Failed to add 0.0.0.0 listener, " + "the environment may not support IPv4: " + << v4_sock.status(); } return assigned_port; } else { diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc index 46c41263bf..ae193ff2be 100644 --- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc @@ -106,14 +106,15 @@ int CreateSocket(std::function socket_factory, int family, : socket(family, type, protocol); if (res < 0 && errno == EMFILE) { int saved_errno = errno; - GRPC_LOG_EVERY_N_SEC( - 10, GPR_ERROR, - "socket(%d, %d, %d) returned %d with error: |%s|. This process " - "might not have a sufficient file descriptor limit for the number " - "of connections grpc wants to open (which is generally a function of " - "the number of grpc channels, the lb policy of each channel, and the " - "number of backends each channel is load balancing across).", - family, type, protocol, res, grpc_core::StrError(errno).c_str()); + LOG_EVERY_N_SEC(ERROR, 10) + << "socket(" << family << ", " << type << ", " << protocol + << ") returned " << res << " with error: |" + << grpc_core::StrError(errno) + << "|. This process might not have a sufficient file descriptor limit " + "for the number of connections grpc wants to open (which is " + "generally a function of the number of grpc channels, the lb policy " + "of each channel, and the number of backends each channel is load " + "balancing across)."; errno = saved_errno; } return res; @@ -148,15 +149,21 @@ absl::Status PrepareTcpClientSocket(PosixSocketWrapper sock, return absl::OkStatus(); } +#endif // GRPC_POSIX_SOCKET_UTILS_COMMON + +} // namespace + +#ifdef GRPC_POSIX_SOCKET_UTILS_COMMON +#ifndef GRPC_SET_SOCKET_DUALSTACK_CUSTOM + bool SetSocketDualStack(int fd) { const int off = 0; return 0 == setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &off, sizeof(off)); } +#endif // GRPC_SET_SOCKET_DUALSTACK_CUSTOM #endif // GRPC_POSIX_SOCKET_UTILS_COMMON -} // namespace - PosixTcpOptions TcpOptionsFromEndpointConfig(const EndpointConfig& config) { void* value; PosixTcpOptions options; @@ -627,12 +634,16 @@ void PosixSocketWrapper::TrySetSocketTcpUserTimeout( // if it is available. if (g_socket_supports_tcp_user_timeout.load() == 0) { if (0 != getsockopt(fd_, IPPROTO_TCP, TCP_USER_TIMEOUT, &newval, &len)) { - LOG(INFO) << "TCP_USER_TIMEOUT is not available. TCP_USER_TIMEOUT " - "won't be used thereafter"; + // This log is intentionally not protected behind a flag, so that users + // know that TCP_USER_TIMEOUT is not being used. + GRPC_TRACE_LOG(tcp, INFO) + << "TCP_USER_TIMEOUT is not available. TCP_USER_TIMEOUT " + "won't be used thereafter"; g_socket_supports_tcp_user_timeout.store(-1); } else { - LOG(INFO) << "TCP_USER_TIMEOUT is available. TCP_USER_TIMEOUT will be " - "used thereafter"; + GRPC_TRACE_LOG(tcp, INFO) + << "TCP_USER_TIMEOUT is available. TCP_USER_TIMEOUT will be " + "used thereafter"; g_socket_supports_tcp_user_timeout.store(1); } } @@ -681,7 +692,8 @@ bool PosixSocketWrapper::IsIpv6LoopbackAvailable() { int fd = socket(AF_INET6, SOCK_STREAM, 0); bool loopback_available = false; if (fd < 0) { - LOG(INFO) << "Disabling AF_INET6 sockets because socket() failed."; + GRPC_TRACE_LOG(tcp, INFO) + << "Disabling AF_INET6 sockets because socket() failed."; } else { sockaddr_in6 addr; memset(&addr, 0, sizeof(addr)); @@ -690,7 +702,8 @@ bool PosixSocketWrapper::IsIpv6LoopbackAvailable() { if (bind(fd, reinterpret_cast(&addr), sizeof(addr)) == 0) { loopback_available = true; } else { - LOG(INFO) << "Disabling AF_INET6 sockets because ::1 is not available."; + GRPC_TRACE_LOG(tcp, INFO) + << "Disabling AF_INET6 sockets because ::1 is not available."; } close(fd); } diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h index 5bc53dbd39..15f6c5d88d 100644 --- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h @@ -323,6 +323,8 @@ struct PosixSocketWrapper::PosixSocketCreateResult { EventEngine::ResolvedAddress mapped_target_addr; }; +bool SetSocketDualStack(int fd); + } // namespace experimental } // namespace grpc_event_engine diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.cc b/src/core/lib/event_engine/posix_engine/timer_manager.cc index 1c9f81f641..3ab3eb75f4 100644 --- a/src/core/lib/event_engine/posix_engine/timer_manager.cc +++ b/src/core/lib/event_engine/posix_engine/timer_manager.cc @@ -22,10 +22,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/time/time.h" #include "absl/types/optional.h" -#include #include #include @@ -102,10 +102,9 @@ void TimerManager::TimerInit(Timer* timer, grpc_core::Timestamp deadline, if (GRPC_TRACE_FLAG_ENABLED(timer)) { grpc_core::MutexLock lock(&mu_); if (shutdown_) { - gpr_log(GPR_ERROR, - "WARNING: TimerManager::%p: scheduling Closure::%p after " - "TimerManager has been shut down.", - this, closure); + LOG(ERROR) << "WARNING: TimerManager::" << this + << ": scheduling Closure::" << closure + << " after TimerManager has been shut down."; } } timer_list_->TimerInit(timer, deadline, closure); @@ -120,7 +119,7 @@ void TimerManager::Shutdown() { grpc_core::MutexLock lock(&mu_); if (shutdown_) return; if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TimerManager::%p shutting down", this); + VLOG(2) << "TimerManager::" << this << " shutting down"; } shutdown_ = true; // Wait on the main loop to exit. @@ -128,7 +127,7 @@ void TimerManager::Shutdown() { } main_loop_exit_signal_->WaitForNotification(); if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TimerManager::%p shutdown complete", this); + VLOG(2) << "TimerManager::" << this << " shutdown complete"; } } @@ -146,7 +145,7 @@ void TimerManager::RestartPostFork() { grpc_core::MutexLock lock(&mu_); CHECK(GPR_LIKELY(shutdown_)); if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TimerManager::%p restarting after shutdown", this); + VLOG(2) << "TimerManager::" << this << " restarting after shutdown"; } shutdown_ = false; main_loop_exit_signal_.emplace(); diff --git a/src/core/lib/event_engine/thread_pool/thread_count.cc b/src/core/lib/event_engine/thread_pool/thread_count.cc index 362fad18bb..9148b1a5d2 100644 --- a/src/core/lib/event_engine/thread_pool/thread_count.cc +++ b/src/core/lib/event_engine/thread_pool/thread_count.cc @@ -17,6 +17,7 @@ #include +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" #include "absl/time/clock.h" @@ -52,8 +53,8 @@ absl::Status LivingThreadCount::BlockUntilThreadCount( prev_thread_count = curr_threads; timeout_baseline = grpc_core::Timestamp::Now(); } - GRPC_LOG_EVERY_N_SEC_DELAYED( - log_rate.seconds(), GPR_DEBUG, + GRPC_LOG_EVERY_N_SEC_DELAYED_DEBUG( + log_rate.seconds(), "Waiting for thread pool to idle before %s. (%" PRIdPTR " to %" PRIdPTR "). Timing out in %0.f seconds.", why, curr_threads, desired_threads, diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc index 7c0e421c4f..57c664f67b 100644 --- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc +++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc @@ -36,9 +36,9 @@ #include #include "src/core/lib/backoff/backoff.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/thread_local.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/work_queue/basic_work_queue.h" #include "src/core/lib/event_engine/work_queue/work_queue.h" #include "src/core/lib/gprpp/crash.h" @@ -174,8 +174,8 @@ thread_local WorkQueue* g_local_queue = nullptr; WorkStealingThreadPool::WorkStealingThreadPool(size_t reserve_threads) : pool_{std::make_shared(reserve_threads)} { if (g_log_verbose_failures) { - GRPC_EVENT_ENGINE_TRACE( - "%s", "WorkStealingThreadPool verbose failures are enabled"); + GRPC_TRACE_LOG(event_engine, INFO) + << "WorkStealingThreadPool verbose failures are enabled"; } pool_->Start(); } @@ -266,7 +266,6 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::StartThread() { } void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Quiesce() { - LOG(INFO) << "WorkStealingThreadPoolImpl::Quiesce"; SetShutdown(true); // Wait until all threads have exited. // Note that if this is a threadpool thread then we won't exit this thread @@ -318,7 +317,8 @@ bool WorkStealingThreadPool::WorkStealingThreadPoolImpl::IsQuiesced() { } void WorkStealingThreadPool::WorkStealingThreadPoolImpl::PrepareFork() { - LOG(INFO) << "WorkStealingThreadPoolImpl::PrepareFork"; + GRPC_TRACE_LOG(event_engine, INFO) + << "WorkStealingThreadPoolImpl::PrepareFork"; SetForking(true); work_signal_.SignalAll(); auto threads_were_shut_down = living_thread_count_.BlockUntilThreadCount( @@ -413,9 +413,9 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Lifeguard:: WorkStealingThreadPool::WorkStealingThreadPoolImpl::Lifeguard::~Lifeguard() { lifeguard_should_shut_down_->Notify(); while (lifeguard_running_.load(std::memory_order_relaxed)) { - GRPC_LOG_EVERY_N_SEC_DELAYED(kBlockingQuiesceLogRateSeconds, GPR_DEBUG, - "%s", - "Waiting for lifeguard thread to shut down"); + GRPC_LOG_EVERY_N_SEC_DELAYED_DEBUG( + kBlockingQuiesceLogRateSeconds, "%s", + "Waiting for lifeguard thread to shut down"); lifeguard_is_shut_down_->WaitForNotification(); } // Do an additional wait in case this method races with LifeguardMain's @@ -456,10 +456,9 @@ void WorkStealingThreadPool::WorkStealingThreadPoolImpl::Lifeguard:: // TODO(hork): new threads may spawn when there is no work in the global // queue, nor any work to steal. Add more sophisticated logic about when to // start a thread. - GRPC_EVENT_ENGINE_TRACE( - "Starting new ThreadPool thread due to backlog (total threads: %" PRIuPTR - ")", - living_thread_count + 1); + GRPC_TRACE_LOG(event_engine, INFO) + << "Starting new ThreadPool thread due to backlog (total threads: " + << living_thread_count + 1; pool_->StartThread(); // Tell the lifeguard to monitor the pool more closely. backoff_.Reset(); diff --git a/src/core/lib/event_engine/trace.h b/src/core/lib/event_engine/trace.h deleted file mode 100644 index 5b91ffb949..0000000000 --- a/src/core/lib/event_engine/trace.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2022 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_SRC_CORE_LIB_EVENT_ENGINE_TRACE_H -#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TRACE_H - -#include -#include - -#include "src/core/lib/debug/trace.h" - -#define GRPC_EVENT_ENGINE_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { \ - gpr_log(GPR_ERROR, "(event_engine) " format, __VA_ARGS__); \ - } - -#define GRPC_EVENT_ENGINE_ENDPOINT_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(event_engine_endpoint)) { \ - gpr_log(GPR_ERROR, "(event_engine endpoint) " format, __VA_ARGS__); \ - } - -#define GRPC_EVENT_ENGINE_POLLER_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(event_engine_poller)) { \ - gpr_log(GPR_ERROR, "(event_engine poller) " format, __VA_ARGS__); \ - } - -#endif // GRPC_SRC_CORE_LIB_EVENT_ENGINE_TRACE_H diff --git a/src/core/lib/event_engine/windows/iocp.cc b/src/core/lib/event_engine/windows/iocp.cc index c3b9a37e87..b81ec3dc50 100644 --- a/src/core/lib/event_engine/windows/iocp.cc +++ b/src/core/lib/event_engine/windows/iocp.cc @@ -25,7 +25,6 @@ #include "src/core/lib/event_engine/thread_pool/thread_pool.h" #include "src/core/lib/event_engine/time_util.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/gprpp/crash.h" @@ -60,9 +59,9 @@ std::unique_ptr IOCP::Watch(SOCKET socket) { } void IOCP::Shutdown() { - GRPC_EVENT_ENGINE_POLLER_TRACE( - "IOCP::%p shutting down. Outstanding kicks: %d", this, - outstanding_kicks_.load()); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "IOCP::" << this + << " shutting down. Outstanding kicks: " << outstanding_kicks_.load(); while (outstanding_kicks_.load() > 0) { Work(std::chrono::hours(42), []() {}); } @@ -74,18 +73,20 @@ Poller::WorkResult IOCP::Work(EventEngine::Duration timeout, DWORD bytes = 0; ULONG_PTR completion_key; LPOVERLAPPED overlapped; - GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p doing work", this); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "IOCP::" << this << " doing work"; BOOL success = GetQueuedCompletionStatus( iocp_handle_, &bytes, &completion_key, &overlapped, static_cast(Milliseconds(timeout))); if (success == 0 && overlapped == nullptr) { - GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p deadline exceeded", this); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "IOCP::" << this << " deadline exceeded"; return Poller::WorkResult::kDeadlineExceeded; } CHECK(completion_key); CHECK(overlapped); if (overlapped == &kick_overlap_) { - GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p kicked", this); + GRPC_TRACE_LOG(event_engine_poller, INFO) << "IOCP::" << this << " kicked"; outstanding_kicks_.fetch_sub(1); if (completion_key == (ULONG_PTR)&kick_token_) { return Poller::WorkResult::kKicked; @@ -93,8 +94,8 @@ Poller::WorkResult IOCP::Work(EventEngine::Duration timeout, grpc_core::Crash( absl::StrFormat("Unknown custom completion key: %lu", completion_key)); } - GRPC_EVENT_ENGINE_POLLER_TRACE("IOCP::%p got event on OVERLAPPED::%p", this, - overlapped); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "IOCP::" << this << " got event on OVERLAPPED::" << overlapped; // Safety note: socket is guaranteed to exist when managed by a // WindowsEndpoint. If an overlapped event came in, then either a read event // handler is registered, which keeps the socket alive, or the WindowsEndpoint diff --git a/src/core/lib/event_engine/windows/win_socket.cc b/src/core/lib/event_engine/windows/win_socket.cc index c5dc520cd7..8c18b09ae4 100644 --- a/src/core/lib/event_engine/windows/win_socket.cc +++ b/src/core/lib/event_engine/windows/win_socket.cc @@ -22,7 +22,6 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/sync.h" @@ -49,7 +48,8 @@ WinSocket::WinSocket(SOCKET socket, ThreadPool* thread_pool) noexcept WinSocket::~WinSocket() { CHECK(is_shutdown_.load()); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WinSocket::%p destroyed", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WinSocket::" << this << " destroyed"; } SOCKET WinSocket::raw_socket() { return socket_; } @@ -57,8 +57,8 @@ SOCKET WinSocket::raw_socket() { return socket_; } void WinSocket::Shutdown() { // if already shutdown, return early. Otherwise, set the shutdown flag. if (is_shutdown_.exchange(true)) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WinSocket::%p already shutting down", - this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WinSocket::" << this << " already shutting down"; return; } // Grab the function pointer for DisconnectEx for that specific socket. @@ -71,7 +71,8 @@ void WinSocket::Shutdown() { &ioctl_num_bytes, NULL, NULL); if (status != 0) { char* utf8_message = gpr_format_message(WSAGetLastError()); - LOG(INFO) << "Unable to retrieve DisconnectEx pointer : " << utf8_message; + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "Unable to retrieve DisconnectEx pointer : " << utf8_message; gpr_free(utf8_message); } else if (DisconnectEx(socket_, NULL, 0, 0) == FALSE) { auto last_error = WSAGetLastError(); @@ -79,19 +80,21 @@ void WinSocket::Shutdown() { // error, and log all others. if (last_error != WSAENOTCONN) { char* utf8_message = gpr_format_message(last_error); - LOG(INFO) << "DisconnectEx failed: " << utf8_message; + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "DisconnectEx failed: " << utf8_message; gpr_free(utf8_message); } } closesocket(socket_); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WinSocket::%p socket closed", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WinSocket::" << this << " socket closed"; } void WinSocket::Shutdown(const grpc_core::DebugLocation& location, absl::string_view reason) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE( - "WinSocket::%p Shut down from %s:%d. Reason: %s", this, location.file(), - location.line(), reason.data()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WinSocket::" << this << " Shut down from " << location.file() << ":" + << location.line() << ". Reason: " << reason.data(); Shutdown(); } @@ -170,10 +173,11 @@ void WinSocket::OpState::GetOverlappedResult(SOCKET sock) { bool WinSocket::IsShutdown() { return is_shutdown_.load(); } WinSocket::OpState* WinSocket::GetOpInfoForOverlapped(OVERLAPPED* overlapped) { - GRPC_EVENT_ENGINE_POLLER_TRACE( - "WinSocket::%p looking for matching OVERLAPPED::%p. " - "read(%p) write(%p)", - this, overlapped, &read_info_.overlapped_, &write_info_.overlapped_); + GRPC_TRACE_LOG(event_engine_poller, INFO) + << "WinSocket::" << this + << " looking for matching OVERLAPPED::" << overlapped << ". read(" + << &read_info_.overlapped_ << ") write(" << &write_info_.overlapped_ + << ")"; if (overlapped == &read_info_.overlapped_) return &read_info_; if (overlapped == &write_info_.overlapped_) return &write_info_; return nullptr; diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc index 9ace8ddccb..d3bda779dd 100644 --- a/src/core/lib/event_engine/windows/windows_endpoint.cc +++ b/src/core/lib/event_engine/windows/windows_endpoint.cc @@ -18,6 +18,7 @@ #include "absl/cleanup/cleanup.h" #include "absl/functional/any_invocable.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" @@ -26,7 +27,6 @@ #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/status_helper.h" @@ -42,8 +42,8 @@ constexpr int kMaxWSABUFCount = 16; void DumpSliceBuffer(SliceBuffer* buffer, absl::string_view context_string) { for (size_t i = 0; i < buffer->Count(); i++) { auto str = buffer->MutableSliceAt(i).as_string_view(); - gpr_log(GPR_INFO, "%s: %.*s", context_string.data(), str.length(), - str.data()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << context_string << ": " << str; } } @@ -74,11 +74,12 @@ WindowsEndpoint::WindowsEndpoint( WindowsEndpoint::~WindowsEndpoint() { io_state_->socket->Shutdown(DEBUG_LOCATION, "~WindowsEndpoint"); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("~WindowsEndpoint::%p", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) << "~WindowsEndpoint::" << this; } void WindowsEndpoint::AsyncIOState::DoTcpRead(SliceBuffer* buffer) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p reading", endpoint); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << endpoint << " reading"; if (socket->IsShutdown()) { socket->read_info()->SetErrorStatus( absl::InternalError("Socket is shutting down.")); @@ -148,7 +149,8 @@ bool WindowsEndpoint::Read(absl::AnyInvocable on_read, bool WindowsEndpoint::Write(absl::AnyInvocable on_writable, SliceBuffer* data, const WriteArgs* /* args */) { - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p writing", this); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << this << " writing"; if (io_state_->socket->IsShutdown()) { io_state_->thread_pool->Run( [on_writable = std::move(on_writable)]() mutable { @@ -159,8 +161,9 @@ bool WindowsEndpoint::Write(absl::AnyInvocable on_writable, if (GRPC_TRACE_FLAG_ENABLED(event_engine_endpoint_data)) { for (size_t i = 0; i < data->Count(); i++) { auto str = data->RefSlice(i).as_string_view(); - gpr_log(GPR_INFO, "WindowsEndpoint::%p WRITE (peer=%s): %.*s", this, - peer_address_string_.c_str(), str.length(), str.data()); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << this + << " WRITE (peer=" << peer_address_string_ << "): " << str; } } CHECK(data->Count() <= UINT_MAX); @@ -278,8 +281,8 @@ void WindowsEndpoint::HandleReadClosure::Run() { // Deletes the shared_ptr when this closure returns // Note that the endpoint may have already been destroyed. auto io_state = std::move(io_state_); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p Handling Read Event", - io_state->endpoint); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << io_state->endpoint << " Handling Read Event"; const auto result = io_state->socket->read_info()->result(); if (!result.error_status.ok()) { buffer_->Clear(); @@ -339,8 +342,8 @@ void WindowsEndpoint::HandleReadClosure::DonateSpareSlices( void WindowsEndpoint::HandleWriteClosure::Run() { // Deletes the shared_ptr when this closure returns auto io_state = std::move(io_state_); - GRPC_EVENT_ENGINE_ENDPOINT_TRACE("WindowsEndpoint::%p Handling Write Event", - io_state->endpoint); + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << io_state->endpoint << " Handling Write Event"; const auto result = io_state->socket->write_info()->result(); if (!result.error_status.ok()) { buffer_->Clear(); diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc index 7d683d5269..c691859bdf 100644 --- a/src/core/lib/event_engine/windows/windows_engine.cc +++ b/src/core/lib/event_engine/windows/windows_engine.cc @@ -36,7 +36,6 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/event_engine/thread_pool/thread_pool.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/utils.h" #include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h" #include "src/core/lib/event_engine/windows/iocp.h" @@ -190,9 +189,8 @@ struct WindowsEventEngine::TimerClosure final : public EventEngine::Closure { EventEngine::TaskHandle handle; void Run() override { - GRPC_EVENT_ENGINE_TRACE( - "WindowsEventEngine:%p executing callback:%s", engine, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "WindowsEventEngine:" << engine << " executing callback:" << handle; { grpc_core::MutexLock lock(&engine->task_mu_); engine->known_handles_.erase(handle); @@ -214,16 +212,15 @@ WindowsEventEngine::WindowsEventEngine() } WindowsEventEngine::~WindowsEventEngine() { - GRPC_EVENT_ENGINE_TRACE("~WindowsEventEngine::%p", this); + GRPC_TRACE_LOG(event_engine, INFO) << "~WindowsEventEngine::" << this; { task_mu_.Lock(); if (!known_handles_.empty()) { if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { for (auto handle : known_handles_) { - gpr_log(GPR_ERROR, - "WindowsEventEngine:%p uncleared TaskHandle at shutdown:%s", - this, - HandleToString(handle).c_str()); + LOG(ERROR) << "WindowsEventEngine:" << this + << " uncleared TaskHandle at shutdown:" + << HandleToString(handle); } } // Allow a small grace period for timers to be run before shutting down. @@ -231,8 +228,8 @@ WindowsEventEngine::~WindowsEventEngine() { timer_manager_.Now() + grpc_core::Duration::FromSecondsAsDouble(10); while (!known_handles_.empty() && timer_manager_.Now() < deadline) { if (GRPC_TRACE_FLAG_ENABLED(event_engine)) { - GRPC_LOG_EVERY_N_SEC(1, GPR_DEBUG, "Waiting for timers. %d remaining", - known_handles_.size()); + VLOG_EVERY_N_SEC(2, 1) << "Waiting for timers. " + << known_handles_.size() << " remaining"; } task_mu_.Unlock(); absl::SleepFor(absl::Milliseconds(200)); @@ -253,9 +250,8 @@ WindowsEventEngine::~WindowsEventEngine() { bool WindowsEventEngine::Cancel(EventEngine::TaskHandle handle) { grpc_core::MutexLock lock(&task_mu_); if (!known_handles_.contains(handle)) return false; - GRPC_EVENT_ENGINE_TRACE( - "WindowsEventEngine::%p cancelling %s", this, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "WindowsEventEngine::" << this << " cancelling " << handle; auto* cd = reinterpret_cast(handle.keys[0]); bool r = timer_manager_.TimerCancel(&cd->timer); known_handles_.erase(handle); @@ -292,9 +288,8 @@ EventEngine::TaskHandle WindowsEventEngine::RunAfterInternal( grpc_core::MutexLock lock(&task_mu_); known_handles_.insert(handle); cd->handle = handle; - GRPC_EVENT_ENGINE_TRACE( - "WindowsEventEngine:%p scheduling callback:%s", this, - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "WindowsEventEngine:" << this << " scheduling callback:" << handle; timer_manager_.TimerInit(&cd->timer, when_ts, cd); return handle; } @@ -326,21 +321,24 @@ void WindowsEventEngine::WindowsDNSResolver::LookupTXT( absl::StatusOr> WindowsEventEngine::GetDNSResolver( EventEngine::DNSResolver::ResolverOptions const& options) { + if (ShouldUseAresDnsResolver()) { #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) - auto ares_resolver = AresResolver::CreateAresResolver( - options.dns_server, - std::make_unique(poller()), - shared_from_this()); - if (!ares_resolver.ok()) { - return ares_resolver.status(); + GRPC_TRACE_LOG(event_engine_dns, INFO) + << "WindowsEventEngine::" << this << " creating AresResolver"; + auto ares_resolver = AresResolver::CreateAresResolver( + options.dns_server, + std::make_unique(poller()), + shared_from_this()); + if (!ares_resolver.ok()) { + return ares_resolver.status(); + } + return std::make_unique( + std::move(*ares_resolver)); +#endif // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) } - return std::make_unique( - std::move(*ares_resolver)); -#else // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) GRPC_TRACE_LOG(event_engine_dns, INFO) << "WindowsEventEngine::" << this << " creating NativeWindowsDNSResolver"; return std::make_unique(shared_from_this()); -#endif // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER) } bool WindowsEventEngine::IsWorkerThread() { grpc_core::Crash("unimplemented"); } @@ -360,8 +358,8 @@ void WindowsEventEngine::OnConnectCompleted( known_connection_handles_.erase(state->connection_handle()); } if (erased_handles != 1 || !Cancel(state->timer_handle())) { - GRPC_EVENT_ENGINE_TRACE( - "%s", "Not accepting connection since the deadline timer has fired"); + GRPC_TRACE_LOG(event_engine, INFO) + << "Not accepting connection since the deadline timer has fired"; return; } // Release refs held by the deadline timer. @@ -413,8 +411,8 @@ EventEngine::ConnectionHandle WindowsEventEngine::Connect( }); return EventEngine::ConnectionHandle::kInvalid; } - GRPC_EVENT_ENGINE_TRACE("EventEngine::%p connecting to %s", this, - uri->c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::" << this << " connecting to " << *uri; // Use dualstack sockets where available. ResolvedAddress address = addr; ResolvedAddress addr6_v4mapped; @@ -540,17 +538,16 @@ EventEngine::ConnectionHandle WindowsEventEngine::Connect( bool WindowsEventEngine::CancelConnect(EventEngine::ConnectionHandle handle) { if (handle == EventEngine::ConnectionHandle::kInvalid) { - GRPC_EVENT_ENGINE_TRACE("%s", - "Attempted to cancel an invalid connection handle"); + GRPC_TRACE_LOG(event_engine, INFO) + << "Attempted to cancel an invalid connection handle"; return false; } // Erase the connection handle, which may be unknown { grpc_core::MutexLock lock(&connection_mu_); if (known_connection_handles_.erase(handle) != 1) { - GRPC_EVENT_ENGINE_TRACE( - "Unknown connection handle: %s", - HandleToString(handle).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "Unknown connection handle: " << handle; return false; } } @@ -581,10 +578,8 @@ bool WindowsEventEngine::CancelConnectInternalStateLocked( ConnectionState* connection_state) { connection_state->socket()->Shutdown(DEBUG_LOCATION, "CancelConnect"); // Release the connection_state shared_ptr owned by the connected callback. - GRPC_EVENT_ENGINE_TRACE("Successfully cancelled connection %s", - HandleToString( - connection_state->connection_handle()) - .c_str()); + GRPC_TRACE_LOG(event_engine, INFO) << "Successfully cancelled connection " + << connection_state->connection_handle(); return true; } diff --git a/src/core/lib/event_engine/windows/windows_listener.cc b/src/core/lib/event_engine/windows/windows_listener.cc index 5a682fbcc8..c04346fb9b 100644 --- a/src/core/lib/event_engine/windows/windows_listener.cc +++ b/src/core/lib/event_engine/windows/windows_listener.cc @@ -21,7 +21,6 @@ #include "absl/strings/str_format.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/event_engine/windows/iocp.h" #include "src/core/lib/event_engine/windows/win_socket.h" #include "src/core/lib/event_engine/windows/windows_endpoint.h" @@ -52,10 +51,9 @@ void WindowsEventEngineListener::SinglePortSocketListener:: CHECK_NE(io_state_, nullptr); grpc_core::ReleasableMutexLock lock(&io_state_->mu); if (io_state_->listener_socket->IsShutdown()) { - GRPC_EVENT_ENGINE_TRACE( - "SinglePortSocketListener::%p listener socket is shut down. Shutting " - "down listener.", - io_state_->port_listener); + GRPC_TRACE_LOG(event_engine, INFO) + << "SinglePortSocketListener::" << io_state_->port_listener + << " listener socket is shut down. Shutting down listener."; lock.Release(); io_state_.reset(); return; @@ -103,7 +101,7 @@ WindowsEventEngineListener::SinglePortSocketListener:: io_state_->listener_socket->Shutdown(DEBUG_LOCATION, "~SinglePortSocketListener"); UnlinkIfUnixDomainSocket(listener_sockname()); - GRPC_EVENT_ENGINE_TRACE("~SinglePortSocketListener::%p", this); + GRPC_TRACE_LOG(event_engine, INFO) << "~SinglePortSocketListener::" << this; } absl::StatusOr< @@ -179,9 +177,9 @@ WindowsEventEngineListener::SinglePortSocketListener::StartLocked() { } } io_state_->accept_socket = accept_socket; - GRPC_EVENT_ENGINE_TRACE( - "SinglePortSocketListener::%p listening. listener_socket::%p", this, - io_state_->listener_socket.get()); + GRPC_TRACE_LOG(event_engine, INFO) + << "SinglePortSocketListener::" << this + << " listening. listener_socket::" << io_state_->listener_socket.get(); return absl::OkStatus(); } @@ -311,8 +309,7 @@ WindowsEventEngineListener::WindowsEventEngineListener( on_shutdown_(std::move(on_shutdown)) {} WindowsEventEngineListener::~WindowsEventEngineListener() { - GRPC_EVENT_ENGINE_TRACE( - "%s", absl::StrFormat("~WindowsEventEngineListener::%p", this).c_str()); + GRPC_TRACE_LOG(event_engine, INFO) << "~WindowsEventEngineListener::" << this; ShutdownListeners(); on_shutdown_(absl::OkStatus()); } diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc index ca0ab15142..a9d93f7fe8 100644 --- a/src/core/lib/experiments/config.cc +++ b/src/core/lib/experiments/config.cc @@ -24,12 +24,12 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" -#include #include #include "src/core/lib/config/config_vars.h" @@ -137,8 +137,7 @@ GPR_ATTRIBUTE_NOINLINE Experiments LoadExperimentsFromConfigVariableInner() { // If not found log an error, but don't take any other action. // Allows us an easy path to disabling experiments. if (!found) { - gpr_log(GPR_ERROR, "Unknown experiment: %s", - std::string(experiment).c_str()); + LOG(ERROR) << "Unknown experiment: " << experiment; } } for (size_t i = 0; i < kNumExperiments; i++) { @@ -171,6 +170,7 @@ Experiments& ExperimentsSingleton() { } // namespace void TestOnlyReloadExperimentsFromConfigVariables() { + ExperimentFlags::TestOnlyClear(); ExperimentsSingleton() = LoadExperimentsFromConfigVariable(); PrintExperimentsList(); } @@ -181,8 +181,35 @@ void LoadTestOnlyExperimentsFromMetadata( new TestExperiments(experiment_metadata, num_experiments); } -bool IsExperimentEnabled(size_t experiment_id) { - return ExperimentsSingleton().enabled[experiment_id]; +std::atomic + ExperimentFlags::experiment_flags_[kNumExperimentFlagsWords]; + +bool ExperimentFlags::LoadFlagsAndCheck(size_t experiment_id) { + static_assert(kNumExperiments < kNumExperimentFlagsWords * kFlagsPerWord, + "kNumExperiments must be less than " + "kNumExperimentFlagsWords*kFlagsPerWord; if this fails then " + "make kNumExperimentFlagsWords bigger."); + const auto& experiments = ExperimentsSingleton(); + uint64_t building[kNumExperimentFlagsWords]; + for (size_t i = 0; i < kNumExperimentFlagsWords; i++) { + building[i] = kLoadedFlag; + } + for (size_t i = 0; i < kNumExperiments; i++) { + if (!experiments.enabled[i]) continue; + auto bit = i % kFlagsPerWord; + auto word = i / kFlagsPerWord; + building[word] |= 1ull << bit; + } + for (size_t i = 0; i < kNumExperimentFlagsWords; i++) { + experiment_flags_[i].store(building[i], std::memory_order_relaxed); + } + return experiments.enabled[experiment_id]; +} + +void ExperimentFlags::TestOnlyClear() { + for (size_t i = 0; i < kNumExperimentFlagsWords; i++) { + experiment_flags_[i].store(0, std::memory_order_relaxed); + } } bool IsExperimentEnabledInConfiguration(size_t experiment_id) { @@ -227,19 +254,20 @@ void PrintExperimentsList() { } if (experiment_status.empty()) { if (!defaulted_on_experiments.empty()) { - gpr_log(GPR_INFO, "gRPC experiments enabled: %s", - absl::StrJoin(defaulted_on_experiments, ", ").c_str()); + VLOG(2) << "gRPC experiments enabled: " + << absl::StrJoin(defaulted_on_experiments, ", "); } } else { if (defaulted_on_experiments.empty()) { - gpr_log(GPR_INFO, "gRPC experiments: %s", - absl::StrJoin(experiment_status, ", ", absl::PairFormatter(":")) - .c_str()); + VLOG(2) << "gRPC experiments: " + << absl::StrJoin(experiment_status, ", ", + absl::PairFormatter(":")); } else { - gpr_log(GPR_INFO, "gRPC experiments: %s; default-enabled: %s", - absl::StrJoin(experiment_status, ", ", absl::PairFormatter(":")) - .c_str(), - absl::StrJoin(defaulted_on_experiments, ", ").c_str()); + VLOG(2) << "gRPC experiments: " + << absl::StrJoin(experiment_status, ", ", + absl::PairFormatter(":")) + << "; default-enabled: " + << absl::StrJoin(defaulted_on_experiments, ", "); } } } @@ -256,8 +284,8 @@ void ForceEnableExperiment(absl::string_view experiment, bool enable) { } return; } - gpr_log(GPR_INFO, "gRPC EXPERIMENT %s not found to force %s", - std::string(experiment).c_str(), enable ? "enable" : "disable"); + LOG(INFO) << "gRPC EXPERIMENT " << experiment << " not found to force " + << (enable ? "enable" : "disable"); } void RegisterExperimentConstraintsValidator( diff --git a/src/core/lib/experiments/config.h b/src/core/lib/experiments/config.h index 2c601001bf..921875b99b 100644 --- a/src/core/lib/experiments/config.h +++ b/src/core/lib/experiments/config.h @@ -18,6 +18,8 @@ #include #include +#include + #include "absl/functional/any_invocable.h" #include "absl/strings/string_view.h" @@ -38,16 +40,68 @@ struct ExperimentMetadata { }; #ifndef GRPC_EXPERIMENTS_ARE_FINAL +class ExperimentFlags { + public: + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsExperimentEnabled( + size_t experiment_id) { + auto bit = experiment_id % kFlagsPerWord; + auto word = experiment_id / kFlagsPerWord; + auto cur = experiment_flags_[word].load(std::memory_order_relaxed); + if (cur & (1ull << bit)) return true; + if (cur & kLoadedFlag) return false; + return LoadFlagsAndCheck(experiment_id); + } + + template + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsExperimentEnabled() { + auto bit = kExperimentId % kFlagsPerWord; + auto word = kExperimentId / kFlagsPerWord; + auto cur = experiment_flags_[word].load(std::memory_order_relaxed); + if (cur & (1ull << bit)) return true; + if (cur & kLoadedFlag) return false; + return LoadFlagsAndCheck(kExperimentId); + } + + static void TestOnlyClear(); + + private: + static bool LoadFlagsAndCheck(size_t experiment_id); + + // We layout experiment flags in groups of 63... each 64 bit word contains + // 63 enablement flags (one per experiment), and the high bit which indicates + // whether the flags have been loaded from the configuration. + // Consequently, with one load, we can tell if the experiment is definitely + // enabled (the bit is set), or definitely disabled (the bit is clear, and the + // loaded flag is set), or if we need to load the flags and re-check. + + static constexpr size_t kNumExperimentFlagsWords = 8; + static constexpr size_t kFlagsPerWord = 63; + static constexpr uint64_t kLoadedFlag = 0x8000000000000000ull; + static std::atomic experiment_flags_[kNumExperimentFlagsWords]; +}; + // Return true if experiment \a experiment_id is enabled. // Experiments are numbered by their order in the g_experiment_metadata array // declared in experiments.h. -bool IsExperimentEnabled(size_t experiment_id); +inline bool IsExperimentEnabled(size_t experiment_id) { + return ExperimentFlags::IsExperimentEnabled(experiment_id); +} + +template +inline bool IsExperimentEnabled() { + return ExperimentFlags::IsExperimentEnabled(); +} // Given a test experiment id, returns true if the test experiment is enabled. // Test experiments can be loaded using the LoadTestOnlyExperimentsFromMetadata // method. bool IsTestExperimentEnabled(size_t experiment_id); +template +inline bool IsTestExperimentEnabled() { + return IsTestExperimentEnabled(kExperimentId); +} + // Slow check for if a named experiment is enabled. // Parses the configuration and looks up the experiment in that, so it does not // affect any global state, but it does require parsing the configuration every diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index abaf294db5..70326c3782 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -27,6 +27,9 @@ const char* const description_call_status_override_on_cancellation = "with cancellation."; const char* const additional_constraints_call_status_override_on_cancellation = "{}"; +const char* const description_call_tracer_in_transport = + "Transport directly passes byte counts to CallTracer."; +const char* const additional_constraints_call_tracer_in_transport = "{}"; const char* const description_canary_client_privacy = "If set, canary client privacy"; const char* const additional_constraints_canary_client_privacy = "{}"; @@ -44,17 +47,6 @@ const char* const additional_constraints_event_engine_listener = "{}"; const char* const description_free_large_allocator = "If set, return all free bytes from a \042big\042 allocator"; const char* const additional_constraints_free_large_allocator = "{}"; -const char* const description_http2_stats_fix = - "Fix on HTTP2 outgoing data stats reporting"; -const char* const additional_constraints_http2_stats_fix = "{}"; -const char* const description_keepalive_fix = - "Allows overriding keepalive_permit_without_calls. Refer " - "https://github.com/grpc/grpc/pull/33428 for more information."; -const char* const additional_constraints_keepalive_fix = "{}"; -const char* const description_keepalive_server_fix = - "Allows overriding keepalive_permit_without_calls for servers. Refer " - "https://github.com/grpc/grpc/pull/33917 for more information."; -const char* const additional_constraints_keepalive_server_fix = "{}"; const char* const description_max_pings_wo_data_throttle = "Experiment to throttle pings to a period of 1 min when " "GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA limit has reached (instead of " @@ -121,6 +113,8 @@ const ExperimentMetadata g_experiment_metadata[] = { description_call_status_override_on_cancellation, additional_constraints_call_status_override_on_cancellation, nullptr, 0, true, true}, + {"call_tracer_in_transport", description_call_tracer_in_transport, + additional_constraints_call_tracer_in_transport, nullptr, 0, true, true}, {"canary_client_privacy", description_canary_client_privacy, additional_constraints_canary_client_privacy, nullptr, 0, false, false}, {"client_privacy", description_client_privacy, @@ -133,12 +127,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_event_engine_listener, nullptr, 0, false, true}, {"free_large_allocator", description_free_large_allocator, additional_constraints_free_large_allocator, nullptr, 0, false, true}, - {"http2_stats_fix", description_http2_stats_fix, - additional_constraints_http2_stats_fix, nullptr, 0, true, true}, - {"keepalive_fix", description_keepalive_fix, - additional_constraints_keepalive_fix, nullptr, 0, false, false}, - {"keepalive_server_fix", description_keepalive_server_fix, - additional_constraints_keepalive_server_fix, nullptr, 0, false, false}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, @@ -189,6 +177,9 @@ const char* const description_call_status_override_on_cancellation = "with cancellation."; const char* const additional_constraints_call_status_override_on_cancellation = "{}"; +const char* const description_call_tracer_in_transport = + "Transport directly passes byte counts to CallTracer."; +const char* const additional_constraints_call_tracer_in_transport = "{}"; const char* const description_canary_client_privacy = "If set, canary client privacy"; const char* const additional_constraints_canary_client_privacy = "{}"; @@ -206,17 +197,6 @@ const char* const additional_constraints_event_engine_listener = "{}"; const char* const description_free_large_allocator = "If set, return all free bytes from a \042big\042 allocator"; const char* const additional_constraints_free_large_allocator = "{}"; -const char* const description_http2_stats_fix = - "Fix on HTTP2 outgoing data stats reporting"; -const char* const additional_constraints_http2_stats_fix = "{}"; -const char* const description_keepalive_fix = - "Allows overriding keepalive_permit_without_calls. Refer " - "https://github.com/grpc/grpc/pull/33428 for more information."; -const char* const additional_constraints_keepalive_fix = "{}"; -const char* const description_keepalive_server_fix = - "Allows overriding keepalive_permit_without_calls for servers. Refer " - "https://github.com/grpc/grpc/pull/33917 for more information."; -const char* const additional_constraints_keepalive_server_fix = "{}"; const char* const description_max_pings_wo_data_throttle = "Experiment to throttle pings to a period of 1 min when " "GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA limit has reached (instead of " @@ -283,6 +263,8 @@ const ExperimentMetadata g_experiment_metadata[] = { description_call_status_override_on_cancellation, additional_constraints_call_status_override_on_cancellation, nullptr, 0, true, true}, + {"call_tracer_in_transport", description_call_tracer_in_transport, + additional_constraints_call_tracer_in_transport, nullptr, 0, true, true}, {"canary_client_privacy", description_canary_client_privacy, additional_constraints_canary_client_privacy, nullptr, 0, false, false}, {"client_privacy", description_client_privacy, @@ -295,12 +277,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_event_engine_listener, nullptr, 0, true, true}, {"free_large_allocator", description_free_large_allocator, additional_constraints_free_large_allocator, nullptr, 0, false, true}, - {"http2_stats_fix", description_http2_stats_fix, - additional_constraints_http2_stats_fix, nullptr, 0, true, true}, - {"keepalive_fix", description_keepalive_fix, - additional_constraints_keepalive_fix, nullptr, 0, false, false}, - {"keepalive_server_fix", description_keepalive_server_fix, - additional_constraints_keepalive_server_fix, nullptr, 0, false, false}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, @@ -351,6 +327,9 @@ const char* const description_call_status_override_on_cancellation = "with cancellation."; const char* const additional_constraints_call_status_override_on_cancellation = "{}"; +const char* const description_call_tracer_in_transport = + "Transport directly passes byte counts to CallTracer."; +const char* const additional_constraints_call_tracer_in_transport = "{}"; const char* const description_canary_client_privacy = "If set, canary client privacy"; const char* const additional_constraints_canary_client_privacy = "{}"; @@ -368,17 +347,6 @@ const char* const additional_constraints_event_engine_listener = "{}"; const char* const description_free_large_allocator = "If set, return all free bytes from a \042big\042 allocator"; const char* const additional_constraints_free_large_allocator = "{}"; -const char* const description_http2_stats_fix = - "Fix on HTTP2 outgoing data stats reporting"; -const char* const additional_constraints_http2_stats_fix = "{}"; -const char* const description_keepalive_fix = - "Allows overriding keepalive_permit_without_calls. Refer " - "https://github.com/grpc/grpc/pull/33428 for more information."; -const char* const additional_constraints_keepalive_fix = "{}"; -const char* const description_keepalive_server_fix = - "Allows overriding keepalive_permit_without_calls for servers. Refer " - "https://github.com/grpc/grpc/pull/33917 for more information."; -const char* const additional_constraints_keepalive_server_fix = "{}"; const char* const description_max_pings_wo_data_throttle = "Experiment to throttle pings to a period of 1 min when " "GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA limit has reached (instead of " @@ -445,6 +413,8 @@ const ExperimentMetadata g_experiment_metadata[] = { description_call_status_override_on_cancellation, additional_constraints_call_status_override_on_cancellation, nullptr, 0, true, true}, + {"call_tracer_in_transport", description_call_tracer_in_transport, + additional_constraints_call_tracer_in_transport, nullptr, 0, true, true}, {"canary_client_privacy", description_canary_client_privacy, additional_constraints_canary_client_privacy, nullptr, 0, false, false}, {"client_privacy", description_client_privacy, @@ -457,12 +427,6 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_event_engine_listener, nullptr, 0, true, true}, {"free_large_allocator", description_free_large_allocator, additional_constraints_free_large_allocator, nullptr, 0, false, true}, - {"http2_stats_fix", description_http2_stats_fix, - additional_constraints_http2_stats_fix, nullptr, 0, true, true}, - {"keepalive_fix", description_keepalive_fix, - additional_constraints_keepalive_fix, nullptr, 0, false, false}, - {"keepalive_server_fix", description_keepalive_server_fix, - additional_constraints_keepalive_server_fix, nullptr, 0, false, false}, {"max_pings_wo_data_throttle", description_max_pings_wo_data_throttle, additional_constraints_max_pings_wo_data_throttle, nullptr, 0, false, true}, @@ -501,7 +465,7 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true, true}, {"work_serializer_dispatch", description_work_serializer_dispatch, - additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, + additional_constraints_work_serializer_dispatch, nullptr, 0, false, true}, }; } // namespace grpc_core diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index 5811fe2e7d..498557c511 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -59,16 +59,14 @@ namespace grpc_core { #if defined(GRPC_CFSTREAM) #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT +inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } inline bool IsEventEngineClientEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } inline bool IsEventEngineListenerEnabled() { return false; } inline bool IsFreeLargeAllocatorEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX -inline bool IsHttp2StatsFixEnabled() { return true; } -inline bool IsKeepaliveFixEnabled() { return false; } -inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } @@ -92,6 +90,8 @@ inline bool IsWorkSerializerDispatchEnabled() { return false; } #elif defined(GPR_WINDOWS) #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT +inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT @@ -101,10 +101,6 @@ inline bool IsEventEngineDnsEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX -inline bool IsHttp2StatsFixEnabled() { return true; } -inline bool IsKeepaliveFixEnabled() { return false; } -inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } @@ -128,6 +124,8 @@ inline bool IsWorkSerializerDispatchEnabled() { return false; } #else #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION inline bool IsCallStatusOverrideOnCancellationEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT +inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } inline bool IsEventEngineClientEnabled() { return false; } @@ -136,10 +134,6 @@ inline bool IsEventEngineDnsEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } -#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX -inline bool IsHttp2StatsFixEnabled() { return true; } -inline bool IsKeepaliveFixEnabled() { return false; } -inline bool IsKeepaliveServerFixEnabled() { return false; } inline bool IsMaxPingsWoDataThrottleEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { return true; } @@ -158,22 +152,19 @@ inline bool IsTraceRecordCallopsEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH -inline bool IsWorkSerializerDispatchEnabled() { return true; } +inline bool IsWorkSerializerDispatchEnabled() { return false; } #endif #else enum ExperimentIds { kExperimentIdCallStatusOverrideOnCancellation, + kExperimentIdCallTracerInTransport, kExperimentIdCanaryClientPrivacy, kExperimentIdClientPrivacy, kExperimentIdEventEngineClient, kExperimentIdEventEngineDns, kExperimentIdEventEngineListener, kExperimentIdFreeLargeAllocator, - kExperimentIdHttp2StatsFix, - kExperimentIdKeepaliveFix, - kExperimentIdKeepaliveServerFix, kExperimentIdMaxPingsWoDataThrottle, kExperimentIdMonitoringExperiment, kExperimentIdMultiping, @@ -193,103 +184,95 @@ enum ExperimentIds { }; #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION inline bool IsCallStatusOverrideOnCancellationEnabled() { - return IsExperimentEnabled(kExperimentIdCallStatusOverrideOnCancellation); + return IsExperimentEnabled(); +} +#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT +inline bool IsCallTracerInTransportEnabled() { + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_CANARY_CLIENT_PRIVACY inline bool IsCanaryClientPrivacyEnabled() { - return IsExperimentEnabled(kExperimentIdCanaryClientPrivacy); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_PRIVACY inline bool IsClientPrivacyEnabled() { - return IsExperimentEnabled(kExperimentIdClientPrivacy); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT inline bool IsEventEngineClientEnabled() { - return IsExperimentEnabled(kExperimentIdEventEngineClient); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS inline bool IsEventEngineDnsEnabled() { - return IsExperimentEnabled(kExperimentIdEventEngineDns); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { - return IsExperimentEnabled(kExperimentIdEventEngineListener); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_FREE_LARGE_ALLOCATOR inline bool IsFreeLargeAllocatorEnabled() { - return IsExperimentEnabled(kExperimentIdFreeLargeAllocator); -} -#define GRPC_EXPERIMENT_IS_INCLUDED_HTTP2_STATS_FIX -inline bool IsHttp2StatsFixEnabled() { - return IsExperimentEnabled(kExperimentIdHttp2StatsFix); -} -#define GRPC_EXPERIMENT_IS_INCLUDED_KEEPALIVE_FIX -inline bool IsKeepaliveFixEnabled() { - return IsExperimentEnabled(kExperimentIdKeepaliveFix); -} -#define GRPC_EXPERIMENT_IS_INCLUDED_KEEPALIVE_SERVER_FIX -inline bool IsKeepaliveServerFixEnabled() { - return IsExperimentEnabled(kExperimentIdKeepaliveServerFix); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_MAX_PINGS_WO_DATA_THROTTLE inline bool IsMaxPingsWoDataThrottleEnabled() { - return IsExperimentEnabled(kExperimentIdMaxPingsWoDataThrottle); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT inline bool IsMonitoringExperimentEnabled() { - return IsExperimentEnabled(kExperimentIdMonitoringExperiment); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_MULTIPING inline bool IsMultipingEnabled() { - return IsExperimentEnabled(kExperimentIdMultiping); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_PEER_STATE_BASED_FRAMING inline bool IsPeerStateBasedFramingEnabled() { - return IsExperimentEnabled(kExperimentIdPeerStateBasedFraming); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { - return IsExperimentEnabled(kExperimentIdPickFirstNew); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_INPROC_TRANSPORT inline bool IsPromiseBasedInprocTransportEnabled() { - return IsExperimentEnabled(kExperimentIdPromiseBasedInprocTransport); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_RSTPIT inline bool IsRstpitEnabled() { - return IsExperimentEnabled(kExperimentIdRstpit); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_SCHEDULE_CANCELLATION_OVER_WRITE inline bool IsScheduleCancellationOverWriteEnabled() { - return IsExperimentEnabled(kExperimentIdScheduleCancellationOverWrite); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_PRIVACY inline bool IsServerPrivacyEnabled() { - return IsExperimentEnabled(kExperimentIdServerPrivacy); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_TCP_FRAME_SIZE_TUNING inline bool IsTcpFrameSizeTuningEnabled() { - return IsExperimentEnabled(kExperimentIdTcpFrameSizeTuning); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_TCP_RCV_LOWAT inline bool IsTcpRcvLowatEnabled() { - return IsExperimentEnabled(kExperimentIdTcpRcvLowat); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { - return IsExperimentEnabled(kExperimentIdTraceRecordCallops); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_UNCONSTRAINED_MAX_QUOTA_BUFFER_SIZE inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { - return IsExperimentEnabled(kExperimentIdUnconstrainedMaxQuotaBufferSize); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE inline bool IsWorkSerializerClearsTimeCacheEnabled() { - return IsExperimentEnabled(kExperimentIdWorkSerializerClearsTimeCache); + return IsExperimentEnabled(); } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH inline bool IsWorkSerializerDispatchEnabled() { - return IsExperimentEnabled(kExperimentIdWorkSerializerDispatch); + return IsExperimentEnabled(); } extern const ExperimentMetadata g_experiment_metadata[kNumExperiments]; diff --git a/src/core/lib/gprpp/bitset.h b/src/core/lib/gprpp/bitset.h index ea941b0e10..c224bd257d 100644 --- a/src/core/lib/gprpp/bitset.h +++ b/src/core/lib/gprpp/bitset.h @@ -138,7 +138,7 @@ class BitSet { uint32_t count() const { uint32_t count = 0; for (size_t i = 0; i < kUnits; i++) { - count += BitCount(units_[i]); + count += absl::popcount(units_[i]); } return count; } diff --git a/src/core/lib/gprpp/construct_destruct.h b/src/core/lib/gprpp/construct_destruct.h index d905c26d35..62e4df4bc5 100644 --- a/src/core/lib/gprpp/construct_destruct.h +++ b/src/core/lib/gprpp/construct_destruct.h @@ -24,14 +24,14 @@ namespace grpc_core { // Call the destructor of p without having to name the type of p. template -void Destruct(T* p) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Destruct(T* p) { p->~T(); } // Call the constructor of p without having to name the type of p and forward // any arguments template -void Construct(T* p, Args&&... args) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Construct(T* p, Args&&... args) { new (p) T(std::forward(args)...); } diff --git a/src/core/lib/gprpp/debug_location.h b/src/core/lib/gprpp/debug_location.h index 2637d316d1..89a948da7f 100644 --- a/src/core/lib/gprpp/debug_location.h +++ b/src/core/lib/gprpp/debug_location.h @@ -21,6 +21,8 @@ #include +#include "absl/strings/str_cat.h" + #include #if defined(__has_builtin) @@ -56,6 +58,11 @@ class SourceLocation { int line_; }; +template +void AbslStringify(Sink& out, const SourceLocation& location) { + out.Append(absl::StrCat("[", location.file(), ":", location.line(), "]")); +} + // Used for tracking file and line where a call is made for debug builds. // No-op for non-debug builds. // Callers can use the DEBUG_LOCATION macro in either case. diff --git a/src/core/lib/gprpp/down_cast.h b/src/core/lib/gprpp/down_cast.h index ca1b2d7802..f9f72509ad 100644 --- a/src/core/lib/gprpp/down_cast.h +++ b/src/core/lib/gprpp/down_cast.h @@ -26,7 +26,7 @@ namespace grpc_core { template -inline To DownCast(From* f) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To DownCast(From* f) { static_assert( std::is_base_of::type>::value, "DownCast requires a base-to-derived relationship"); @@ -40,7 +40,7 @@ inline To DownCast(From* f) { } template -inline To DownCast(From& f) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To DownCast(From& f) { return *DownCast::type*>(&f); } diff --git a/src/core/lib/gprpp/dual_ref_counted.h b/src/core/lib/gprpp/dual_ref_counted.h index 3f714e5765..2d5ed35188 100644 --- a/src/core/lib/gprpp/dual_ref_counted.h +++ b/src/core/lib/gprpp/dual_ref_counted.h @@ -93,9 +93,9 @@ class DualRefCounted : public Impl { #ifndef NDEBUG const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); if (trace_ != nullptr) { - LOG(INFO) << trace_ << ":" << this << " unref " << strong_refs << " -> " - << strong_refs - 1 << ", weak_ref " << weak_refs << " -> " - << weak_refs + 1; + VLOG(2) << trace_ << ":" << this << " unref " << strong_refs << " -> " + << strong_refs - 1 << ", weak_ref " << weak_refs << " -> " + << weak_refs + 1; } CHECK_GT(strong_refs, 0u); #endif @@ -112,10 +112,10 @@ class DualRefCounted : public Impl { #ifndef NDEBUG const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); if (trace_ != nullptr) { - LOG(INFO) << trace_ << ":" << this << " " << location.file() << ":" - << location.line() << " unref " << strong_refs << " -> " - << strong_refs - 1 << ", weak_ref " << weak_refs << " -> " - << weak_refs + 1 << ") " << reason; + VLOG(2) << trace_ << ":" << this << " " << location.file() << ":" + << location.line() << " unref " << strong_refs << " -> " + << strong_refs - 1 << ", weak_ref " << weak_refs << " -> " + << weak_refs + 1 << ") " << reason; } CHECK_GT(strong_refs, 0u); #else @@ -137,9 +137,9 @@ class DualRefCounted : public Impl { #ifndef NDEBUG const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); if (trace_ != nullptr) { - LOG(INFO) << trace_ << ":" << this << " ref_if_non_zero " << strong_refs - << " -> " << strong_refs + 1 << " (weak_refs=" << weak_refs - << ")"; + VLOG(2) << trace_ << ":" << this << " ref_if_non_zero " << strong_refs + << " -> " << strong_refs + 1 << " (weak_refs=" << weak_refs + << ")"; } #endif if (strong_refs == 0) return nullptr; @@ -156,10 +156,10 @@ class DualRefCounted : public Impl { #ifndef NDEBUG const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); if (trace_ != nullptr) { - LOG(INFO) << trace_ << ":" << this << " " << location.file() << ":" - << location.line() << " ref_if_non_zero " << strong_refs - << " -> " << strong_refs + 1 << " (weak_refs=" << weak_refs - << ") " << reason; + VLOG(2) << trace_ << ":" << this << " " << location.file() << ":" + << location.line() << " ref_if_non_zero " << strong_refs + << " -> " << strong_refs + 1 << " (weak_refs=" << weak_refs + << ") " << reason; } #else // Avoid unused-parameter warnings for debug-only parameters @@ -214,8 +214,8 @@ class DualRefCounted : public Impl { const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); const uint32_t strong_refs = GetStrongRefs(prev_ref_pair); if (trace != nullptr) { - LOG(INFO) << trace << ":" << this << " weak_unref " << weak_refs << " -> " - << weak_refs - 1 << " (refs=" << strong_refs << ")"; + VLOG(2) << trace << ":" << this << " weak_unref " << weak_refs << " -> " + << weak_refs - 1 << " (refs=" << strong_refs << ")"; } CHECK_GT(weak_refs, 0u); #endif @@ -236,9 +236,9 @@ class DualRefCounted : public Impl { const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); const uint32_t strong_refs = GetStrongRefs(prev_ref_pair); if (trace != nullptr) { - LOG(INFO) << trace << ":" << this << " " << location.file() << ":" - << location.line() << " weak_unref " << weak_refs << " -> " - << weak_refs - 1 << " (refs=" << strong_refs << ") " << reason; + VLOG(2) << trace << ":" << this << " " << location.file() << ":" + << location.line() << " weak_unref " << weak_refs << " -> " + << weak_refs - 1 << " (refs=" << strong_refs << ") " << reason; } CHECK_GT(weak_refs, 0u); #else @@ -301,8 +301,8 @@ class DualRefCounted : public Impl { const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); CHECK_NE(strong_refs, 0u); if (trace_ != nullptr) { - LOG(INFO) << trace_ << ":" << this << " ref " << strong_refs << " -> " - << strong_refs + 1 << "; (weak_refs=" << weak_refs << ")"; + VLOG(2) << trace_ << ":" << this << " ref " << strong_refs << " -> " + << strong_refs + 1 << "; (weak_refs=" << weak_refs << ")"; } #else refs_.fetch_add(MakeRefPair(1, 0), std::memory_order_relaxed); @@ -316,10 +316,10 @@ class DualRefCounted : public Impl { const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); CHECK_NE(strong_refs, 0u); if (trace_ != nullptr) { - LOG(INFO) << trace_ << ":" << this << " " << location.file() << ":" - << location.line() << " ref " << strong_refs << " -> " - << strong_refs + 1 << " (weak_refs=" << weak_refs << ") " - << reason; + VLOG(2) << trace_ << ":" << this << " " << location.file() << ":" + << location.line() << " ref " << strong_refs << " -> " + << strong_refs + 1 << " (weak_refs=" << weak_refs << ") " + << reason; } #else // Use conditionally-important parameters @@ -336,8 +336,8 @@ class DualRefCounted : public Impl { const uint32_t strong_refs = GetStrongRefs(prev_ref_pair); const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); if (trace_ != nullptr) { - LOG(INFO) << trace_ << ":" << this << " weak_ref " << weak_refs << " -> " - << weak_refs + 1 << "; (refs=" << strong_refs << ")"; + VLOG(2) << trace_ << ":" << this << " weak_ref " << weak_refs << " -> " + << weak_refs + 1 << "; (refs=" << strong_refs << ")"; } if (strong_refs == 0) CHECK_NE(weak_refs, 0u); #else @@ -352,9 +352,9 @@ class DualRefCounted : public Impl { const uint32_t strong_refs = GetStrongRefs(prev_ref_pair); const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); if (trace_ != nullptr) { - LOG(INFO) << trace_ << ":" << this << " " << location.file() << ":" - << location.line() << " weak_ref " << weak_refs << " -> " - << weak_refs + 1 << " (refs=" << strong_refs << ") " << reason; + VLOG(2) << trace_ << ":" << this << " " << location.file() << ":" + << location.line() << " weak_ref " << weak_refs << " -> " + << weak_refs + 1 << " (refs=" << strong_refs << ") " << reason; } if (strong_refs == 0) CHECK_NE(weak_refs, 0u); #else diff --git a/src/core/lib/gprpp/dump_args.cc b/src/core/lib/gprpp/dump_args.cc index d4400bbf29..1e2972f6dd 100644 --- a/src/core/lib/gprpp/dump_args.cc +++ b/src/core/lib/gprpp/dump_args.cc @@ -21,7 +21,7 @@ namespace grpc_core { namespace dump_args_detail { -std::ostream& operator<<(std::ostream& out, const DumpArgs& args) { +void DumpArgs::Stringify(CustomSink& sink) const { // Parse the argument string into a vector of keys. // #__VA_ARGS__ produces a stringified version of the arguments passed to the // macro. It's comma separated, and we can use that to split the string into @@ -29,8 +29,8 @@ std::ostream& operator<<(std::ostream& out, const DumpArgs& args) { // we need to skip commas that are inside parenthesis. std::vector keys; int depth = 0; - const char* start = args.arg_string_; - for (const char* p = args.arg_string_; *p; ++p) { + const char* start = arg_string_; + for (const char* p = arg_string_; *p; ++p) { if (*p == '(') { ++depth; } else if (*p == ')') { @@ -41,13 +41,13 @@ std::ostream& operator<<(std::ostream& out, const DumpArgs& args) { } } keys.push_back(start); - CHECK_EQ(keys.size(), args.arg_dumpers_.size()); + CHECK_EQ(keys.size(), arg_dumpers_.size()); for (size_t i = 0; i < keys.size(); i++) { - if (i != 0) out << ", "; - out << absl::StripAsciiWhitespace(keys[i]) << " = "; - args.arg_dumpers_[i](out); + if (i != 0) sink.Append(", "); + sink.Append(absl::StripAsciiWhitespace(keys[i])); + sink.Append(" = "); + arg_dumpers_[i](sink); } - return out; } } // namespace dump_args_detail diff --git a/src/core/lib/gprpp/dump_args.h b/src/core/lib/gprpp/dump_args.h index abd5b6a202..1e89fa48c6 100644 --- a/src/core/lib/gprpp/dump_args.h +++ b/src/core/lib/gprpp/dump_args.h @@ -19,6 +19,9 @@ #include #include "absl/functional/any_invocable.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" namespace grpc_core { namespace dump_args_detail { @@ -39,17 +42,62 @@ class DumpArgs { do_these_things({AddDumper(&args)...}); } - friend std::ostream& operator<<(std::ostream& out, const DumpArgs& args); + template + friend void AbslStringify(Sink& sink, const DumpArgs& dumper) { + CustomSinkImpl custom_sink(sink); + dumper.Stringify(custom_sink); + } + + friend std::ostream& operator<<(std::ostream& out, const DumpArgs& dumper) { + return out << absl::StrCat(dumper); + } private: + class CustomSink { + public: + virtual void Append(absl::string_view x) = 0; + + protected: + ~CustomSink() = default; + }; + + template + class CustomSinkImpl final : public CustomSink { + public: + explicit CustomSinkImpl(Sink& sink) : sink_(sink) {} + void Append(absl::string_view x) override { sink_.Append(x); } + + private: + Sink& sink_; + }; + template int AddDumper(T* p) { - arg_dumpers_.push_back([p](std::ostream& os) { os << *p; }); + arg_dumpers_.push_back( + [p](CustomSink& os) { os.Append(absl::StrCat(*p)); }); return 0; } + int AddDumper(void** p) { + arg_dumpers_.push_back( + [p](CustomSink& os) { os.Append(absl::StrFormat("%p", *p)); }); + return 0; + } + + template + int AddDumper(T** p) { + return AddDumper(reinterpret_cast(p)); + } + + template + int AddDumper(T* const* p) { + return AddDumper(const_cast(p)); + } + + void Stringify(CustomSink& sink) const; + const char* arg_string_; - std::vector> arg_dumpers_; + std::vector> arg_dumpers_; }; } // namespace dump_args_detail diff --git a/src/core/lib/gprpp/status_helper.cc b/src/core/lib/gprpp/status_helper.cc index 40db6dc0cf..a2a5160e2f 100644 --- a/src/core/lib/gprpp/status_helper.cc +++ b/src/core/lib/gprpp/status_helper.cc @@ -342,7 +342,7 @@ google_rpc_Status* StatusToProto(const absl::Status& status, upb_Arena* arena) { PercentEncodingType::Compatible); char* message_percent = reinterpret_cast( upb_Arena_Malloc(arena, message_percent_slice.length())); - if (message_percent_slice.length() > 0) { + if (!message_percent_slice.empty()) { memcpy(message_percent, message_percent_slice.data(), message_percent_slice.length()); } diff --git a/src/core/lib/gprpp/table.h b/src/core/lib/gprpp/table.h index 8c6bc97854..c0f92888b0 100644 --- a/src/core/lib/gprpp/table.h +++ b/src/core/lib/gprpp/table.h @@ -35,20 +35,28 @@ namespace grpc_core { namespace table_detail { // A tuple-like type that contains manually constructed elements. -template +template struct Elements; template -struct Elements : Elements { - union U { - U() {} - ~U() {} - GPR_NO_UNIQUE_ADDRESS T x; +struct Elements::value>, T, Ts...> + : Elements { + struct alignas(T) Data { + unsigned char bytes[sizeof(T)]; }; - U u; + Data x; + Elements() {} + T* ptr() { return reinterpret_cast(x.bytes); } + const T* ptr() const { return reinterpret_cast(x.bytes); } +}; +template +struct Elements::value>, T, Ts...> + : Elements { + T* ptr() { return reinterpret_cast(this); } + const T* ptr() const { return reinterpret_cast(this); } }; template <> -struct Elements<> {}; +struct Elements {}; // Element accessor for Elements<> // Provides a static method f that returns a pointer to the value of element I @@ -58,17 +66,17 @@ struct GetElem; template struct GetElem<0, T, Ts...> { - static T* f(Elements* e) { return &e->u.x; } - static const T* f(const Elements* e) { return &e->u.x; } + static T* f(Elements* e) { return e->ptr(); } + static const T* f(const Elements* e) { return e->ptr(); } }; template struct GetElem { - static auto f(Elements* e) + static auto f(Elements* e) -> decltype(GetElem::f(e)) { return GetElem::f(e); } - static auto f(const Elements* e) + static auto f(const Elements* e) -> decltype(GetElem::f(e)) { return GetElem::f(e); } @@ -340,7 +348,7 @@ class Table { // the default) -- one bit for each type in Ts. using PresentBits = BitSet; // The tuple-like backing structure for Table. - using Elements = table_detail::Elements; + using Elements = table_detail::Elements; // Extractor from Elements template using GetElem = table_detail::GetElem; @@ -442,9 +450,9 @@ class Table { } // Bit field indicating which elements are set. - GPR_NO_UNIQUE_ADDRESS PresentBits present_bits_; + PresentBits present_bits_; // The memory to store the elements themselves. - GPR_NO_UNIQUE_ADDRESS Elements elements_; + Elements elements_; }; } // namespace grpc_core diff --git a/src/core/lib/gprpp/time.h b/src/core/lib/gprpp/time.h index 1f2a481568..2f1be5fa6f 100644 --- a/src/core/lib/gprpp/time.h +++ b/src/core/lib/gprpp/time.h @@ -31,19 +31,7 @@ #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" -#define GRPC_LOG_EVERY_N_SEC(n, severity, format, ...) \ - do { \ - static std::atomic prev{0}; \ - uint64_t now = grpc_core::Timestamp::FromTimespecRoundDown( \ - gpr_now(GPR_CLOCK_MONOTONIC)) \ - .milliseconds_after_process_epoch(); \ - if (prev == 0 || now - prev > (n) * 1000) { \ - prev = now; \ - gpr_log(severity, format, __VA_ARGS__); \ - } \ - } while (0) - -#define GRPC_LOG_EVERY_N_SEC_DELAYED(n, severity, format, ...) \ +#define GRPC_LOG_EVERY_N_SEC_DELAYED_DEBUG(n, format, ...) \ do { \ static std::atomic prev{0}; \ uint64_t now = grpc_core::Timestamp::FromTimespecRoundDown( \ @@ -52,7 +40,7 @@ if (prev == 0) prev = now; \ if (now - prev > (n) * 1000) { \ prev = now; \ - gpr_log(severity, format, __VA_ARGS__); \ + VLOG(2) << absl::StrFormat(format, __VA_ARGS__); \ } \ } while (0) @@ -169,6 +157,11 @@ class Timestamp { std::string ToString() const; + template + friend void AbslStringify(Sink& sink, const Timestamp& t) { + sink.Append(t.ToString()); + } + private: explicit constexpr Timestamp(int64_t millis) : millis_(millis) {} @@ -293,6 +286,11 @@ class Duration { // https://developers.google.com/protocol-buffers/docs/proto3#json std::string ToJsonString() const; + template + friend void AbslStringify(Sink& sink, const Duration& t) { + sink.Append(t.ToString()); + } + private: explicit constexpr Duration(int64_t millis) : millis_(millis) {} @@ -377,9 +375,6 @@ inline Timestamp& Timestamp::operator+=(Duration duration) { void TestOnlySetProcessEpoch(gpr_timespec epoch); -std::ostream& operator<<(std::ostream& out, Timestamp timestamp); -std::ostream& operator<<(std::ostream& out, Duration duration); - } // namespace grpc_core #endif // GRPC_SRC_CORE_LIB_GPRPP_TIME_H diff --git a/src/core/lib/gprpp/unique_type_name.h b/src/core/lib/gprpp/unique_type_name.h index 2e71ab73f0..4fc7c75ed4 100644 --- a/src/core/lib/gprpp/unique_type_name.h +++ b/src/core/lib/gprpp/unique_type_name.h @@ -64,19 +64,12 @@ class UniqueTypeName { Factory(const Factory&) = delete; Factory& operator=(const Factory&) = delete; - UniqueTypeName Create() { return UniqueTypeName(*name_); } + UniqueTypeName Create() const { return UniqueTypeName(*name_); } private: std::string* name_; }; - // Copyable. - UniqueTypeName(const UniqueTypeName& other) : name_(other.name_) {} - UniqueTypeName& operator=(const UniqueTypeName& other) { - name_ = other.name_; - return *this; - } - bool operator==(const UniqueTypeName& other) const { return name_.data() == other.name_.data(); } @@ -87,18 +80,45 @@ class UniqueTypeName { return name_.data() < other.name_.data(); } + template + friend H AbslHashValue(H h, const UniqueTypeName& name) { + return H::combine(std::move(h), + static_cast(name.name_.data())); + } + int Compare(const UniqueTypeName& other) const { return QsortCompare(name_.data(), other.name_.data()); } absl::string_view name() const { return name_; } + template + friend void AbslStringify(Sink& sink, const UniqueTypeName& name) { + sink.Append(name.name_); + } + private: explicit UniqueTypeName(absl::string_view name) : name_(name) {} absl::string_view name_; }; +// Given a type with a member `static absl::string_view TypeName()`, returns a +// UniqueTypeName instance who's string value is the value of TypeName. +template +UniqueTypeName UniqueTypeNameFor() { + static UniqueTypeName::Factory factory(T::TypeName()); + return factory.Create(); +} + } // namespace grpc_core +// Creates a one-off UniqueTypeName in-place. +// Duplicate calls yield different UniqueTypeName instances. +#define GRPC_UNIQUE_TYPE_NAME_HERE(name) \ + ([] { \ + static const ::grpc_core::UniqueTypeName::Factory factory((name)); \ + return factory.Create(); \ + }()) + #endif // GRPC_SRC_CORE_LIB_GPRPP_UNIQUE_TYPE_NAME_H diff --git a/src/core/lib/gprpp/work_serializer.cc b/src/core/lib/gprpp/work_serializer.cc index 45de57f9ba..105aac28a1 100644 --- a/src/core/lib/gprpp/work_serializer.cc +++ b/src/core/lib/gprpp/work_serializer.cc @@ -31,7 +31,6 @@ #include "absl/log/log.h" #include -#include #include #include "src/core/lib/debug/trace.h" @@ -43,6 +42,7 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -137,8 +137,8 @@ class WorkSerializer::LegacyWorkSerializer final : public WorkSerializerImpl { void WorkSerializer::LegacyWorkSerializer::Run(std::function callback, const DebugLocation& location) { if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer::Run() %p Scheduling callback [%s:%d]", - this, location.file(), location.line()); + LOG(INFO) << "WorkSerializer::Run() " << this << " Scheduling callback [" + << location.file() << ":" << location.line() << "]"; } // Increment queue size for the new callback and owner count to attempt to // take ownership of the WorkSerializer. @@ -163,7 +163,7 @@ void WorkSerializer::LegacyWorkSerializer::Run(std::function callback, CallbackWrapper* cb_wrapper = new CallbackWrapper(std::move(callback), location); if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, " Scheduling on queue : item %p", cb_wrapper); + LOG(INFO) << " Scheduling on queue : item " << cb_wrapper; } queue_.Push(&cb_wrapper->mpscq_node); } @@ -174,9 +174,9 @@ void WorkSerializer::LegacyWorkSerializer::Schedule( CallbackWrapper* cb_wrapper = new CallbackWrapper(std::move(callback), location); if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, - "WorkSerializer::Schedule() %p Scheduling callback %p [%s:%d]", - this, cb_wrapper, location.file(), location.line()); + LOG(INFO) << "WorkSerializer::Schedule() " << this + << " Scheduling callback " << cb_wrapper << " [" + << location.file() << ":" << location.line() << "]"; } refs_.fetch_add(MakeRefPair(0, 1), std::memory_order_acq_rel); queue_.Push(&cb_wrapper->mpscq_node); @@ -184,7 +184,7 @@ void WorkSerializer::LegacyWorkSerializer::Schedule( void WorkSerializer::LegacyWorkSerializer::Orphan() { if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer::Orphan() %p", this); + LOG(INFO) << "WorkSerializer::Orphan() " << this; } const uint64_t prev_ref_pair = refs_.fetch_sub(MakeRefPair(0, 1), std::memory_order_acq_rel); @@ -198,7 +198,7 @@ void WorkSerializer::LegacyWorkSerializer::Orphan() { // execute all the scheduled callbacks. void WorkSerializer::LegacyWorkSerializer::DrainQueue() { if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer::DrainQueue() %p", this); + LOG(INFO) << "WorkSerializer::DrainQueue() " << this; } // Attempt to take ownership of the WorkSerializer. Also increment the queue // size as required by `DrainQueueOwned()`. @@ -219,7 +219,7 @@ void WorkSerializer::LegacyWorkSerializer::DrainQueue() { void WorkSerializer::LegacyWorkSerializer::DrainQueueOwned() { if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer::DrainQueueOwned() %p", this); + LOG(INFO) << "WorkSerializer::DrainQueueOwned() " << this; } while (true) { auto prev_ref_pair = refs_.fetch_sub(MakeRefPair(0, 1)); @@ -266,9 +266,9 @@ void WorkSerializer::LegacyWorkSerializer::DrainQueueOwned() { << " Queue returned nullptr, trying again"; } if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, " Running item %p : callback scheduled at [%s:%d]", - cb_wrapper, cb_wrapper->location.file(), - cb_wrapper->location.line()); + LOG(INFO) << " Running item " << cb_wrapper + << " : callback scheduled at [" << cb_wrapper->location.file() + << ":" << cb_wrapper->location.line() << "]"; } cb_wrapper->callback(); delete cb_wrapper; @@ -377,6 +377,8 @@ class WorkSerializer::DispatchingWorkSerializer final // rate of mutex acquisitions per work item tends towards 1. CallbackVector incoming_ ABSL_GUARDED_BY(mu_); + GPR_NO_UNIQUE_ADDRESS latent_see::Flow flow_; + #ifndef NDEBUG static thread_local DispatchingWorkSerializer* running_work_serializer_; #endif @@ -404,8 +406,8 @@ void WorkSerializer::DispatchingWorkSerializer::Orphan() { void WorkSerializer::DispatchingWorkSerializer::Run( std::function callback, const DebugLocation& location) { if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer[%p] Scheduling callback [%s:%d]", this, - location.file(), location.line()); + LOG(INFO) << "WorkSerializer[" << this << "] Scheduling callback [" + << location.file() << ":" << location.line() << "]"; } global_stats().IncrementWorkSerializerItemsEnqueued(); MutexLock lock(&mu_); @@ -428,6 +430,8 @@ void WorkSerializer::DispatchingWorkSerializer::Run( // Implementation of EventEngine::Closure::Run - our actual work loop void WorkSerializer::DispatchingWorkSerializer::Run() { + GRPC_LATENT_SEE_PARENT_SCOPE("WorkSerializer::Run"); + flow_.End(); // TODO(ctiller): remove these when we can deprecate ExecCtx ApplicationCallbackExecCtx app_exec_ctx; ExecCtx exec_ctx; @@ -435,8 +439,8 @@ void WorkSerializer::DispatchingWorkSerializer::Run() { // queue since processing_ is stored in reverse order. auto& cb = processing_.back(); if (GRPC_TRACE_FLAG_ENABLED(work_serializer)) { - gpr_log(GPR_INFO, "WorkSerializer[%p] Executing callback [%s:%d]", this, - cb.location.file(), cb.location.line()); + LOG(INFO) << "WorkSerializer[" << this << "] Executing callback [" + << cb.location.file() << ":" << cb.location.line() << "]"; } // Run the work item. const auto start = std::chrono::steady_clock::now(); @@ -457,6 +461,7 @@ void WorkSerializer::DispatchingWorkSerializer::Run() { if (processing_.empty() && !Refill()) return; // There's still work in processing_, so schedule ourselves again on // EventEngine. + flow_.Begin(GRPC_LATENT_SEE_METADATA("WorkSerializer::Link")); event_engine_->Run(this); } diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index 21d9edef06..26bb7b881d 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -23,7 +23,6 @@ #include "absl/log/check.h" #include "absl/log/log.h" -#include #include #include "src/core/lib/gprpp/crash.h" @@ -114,19 +113,15 @@ void CallCombiner::ScheduleClosure(grpc_closure* closure, void CallCombiner::Start(grpc_closure* closure, grpc_error_handle error, DEBUG_ARGS const char* reason) { - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "==> CallCombiner::Start() [%p] closure=%s [" DEBUG_FMT_STR - "%s] error=%s", - this, closure->DebugString().c_str() DEBUG_FMT_ARGS, reason, - StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(call_combiner, INFO) << absl::StrFormat( + "==> CallCombiner::Start() [%p] closure=%s [" DEBUG_FMT_STR + "%s] error=%s", + this, closure->DebugString().c_str() DEBUG_FMT_ARGS, reason, + StatusToString(error).c_str()); size_t prev_size = static_cast(gpr_atm_full_fetch_add(&size_, (gpr_atm)1)); - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, " size: %" PRIdPTR " -> %" PRIdPTR, prev_size, - prev_size + 1); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << " size: " << prev_size << " -> " << prev_size + 1; if (prev_size == 0) { GRPC_TRACE_LOG(call_combiner, INFO) << " EXECUTING IMMEDIATELY"; // Queue was empty, so execute this closure immediately. @@ -141,16 +136,13 @@ void CallCombiner::Start(grpc_closure* closure, grpc_error_handle error, } void CallCombiner::Stop(DEBUG_ARGS const char* reason) { - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, "==> CallCombiner::Stop() [%p] [" DEBUG_FMT_STR "%s]", - this DEBUG_FMT_ARGS, reason); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << absl::StrFormat("==> CallCombiner::Stop() [%p] [" DEBUG_FMT_STR "%s]", + this DEBUG_FMT_ARGS, reason); size_t prev_size = static_cast(gpr_atm_full_fetch_add(&size_, (gpr_atm)-1)); - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, " size: %" PRIdPTR " -> %" PRIdPTR, prev_size, - prev_size - 1); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << " size: " << prev_size << " -> " << prev_size - 1; CHECK_GE(prev_size, 1u); if (prev_size > 1) { while (true) { @@ -168,10 +160,9 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) { grpc_error_handle error = internal::StatusMoveFromHeapPtr(closure->error_data.error); closure->error_data.error = 0; - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, " EXECUTING FROM QUEUE: closure=%s error=%s", - closure->DebugString().c_str(), StatusToString(error).c_str()); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << " EXECUTING FROM QUEUE: closure=" << closure->DebugString() + << " error=" << StatusToString(error); ScheduleClosure(closure, error); break; } @@ -187,31 +178,26 @@ void CallCombiner::SetNotifyOnCancel(grpc_closure* closure) { // If error is set, invoke the cancellation closure immediately. // Otherwise, store the new closure. if (!original_error.ok()) { - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "call_combiner=%p: scheduling notify_on_cancel callback=%p " - "for pre-existing cancellation", - this, closure); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "call_combiner=" << this + << ": scheduling notify_on_cancel callback=" << closure + << " for pre-existing cancellation"; ExecCtx::Run(DEBUG_LOCATION, closure, original_error); break; } else { if (gpr_atm_full_cas(&cancel_state_, original_state, reinterpret_cast(closure))) { - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, "call_combiner=%p: setting notify_on_cancel=%p", - this, closure); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "call_combiner=" << this + << ": setting notify_on_cancel=" << closure; // If we replaced an earlier closure, invoke the original // closure with absl::OkStatus(). This allows callers to clean // up any resources they may be holding for the callback. if (original_state != 0) { closure = reinterpret_cast(original_state); - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "call_combiner=%p: scheduling old cancel callback=%p", this, - closure); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "call_combiner=" << this + << ": scheduling old cancel callback=" << closure; ExecCtx::Run(DEBUG_LOCATION, closure, absl::OkStatus()); } break; @@ -235,11 +221,9 @@ void CallCombiner::Cancel(grpc_error_handle error) { if (original_state != 0) { grpc_closure* notify_on_cancel = reinterpret_cast(original_state); - if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "call_combiner=%p: scheduling notify_on_cancel callback=%p", - this, notify_on_cancel); - } + GRPC_TRACE_LOG(call_combiner, INFO) + << "call_combiner=" << this + << ": scheduling notify_on_cancel callback=" << notify_on_cancel; ExecCtx::Run(DEBUG_LOCATION, notify_on_cancel, error); } break; diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 0d96950577..d2c7c0c985 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -22,6 +22,7 @@ #include #include "absl/container/inlined_vector.h" +#include "absl/log/log.h" #include #include @@ -166,11 +167,12 @@ class CallCombinerClosureList { closure.reason); } if (GRPC_TRACE_FLAG_ENABLED(call_combiner)) { - gpr_log(GPR_INFO, - "CallCombinerClosureList executing closure while already " - "holding call_combiner %p: closure=%s error=%s reason=%s", - call_combiner, closures_[0].closure->DebugString().c_str(), - StatusToString(closures_[0].error).c_str(), closures_[0].reason); + LOG(INFO) << "CallCombinerClosureList executing closure while already " + "holding call_combiner " + << call_combiner + << ": closure=" << closures_[0].closure->DebugString() + << " error=" << StatusToString(closures_[0].error) + << " reason=" << closures_[0].reason; } // This will release the call combiner. ExecCtx::Run(DEBUG_LOCATION, closures_[0].closure, closures_[0].error); diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc index faee427f2b..de9810ad2c 100644 --- a/src/core/lib/iomgr/cfstream_handle.cc +++ b/src/core/lib/iomgr/cfstream_handle.cc @@ -24,6 +24,8 @@ #ifdef GRPC_CFSTREAM #import +#include "absl/log/log.h" + #include #include #include @@ -64,8 +66,8 @@ void CFStreamHandle::ReadCallback(CFReadStreamRef stream, CFErrorRef stream_error; CFStreamHandle* handle = static_cast(client_callback_info); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream ReadCallback (%p, %p, %lu, %p)", handle, - stream, type, client_callback_info); + VLOG(2) << "CFStream ReadCallback (" << handle << ", " << stream << ", " + << type << ", " << client_callback_info << ")"; } switch (type) { case kCFStreamEventOpenCompleted: @@ -98,8 +100,8 @@ void CFStreamHandle::WriteCallback(CFWriteStreamRef stream, CFErrorRef stream_error; CFStreamHandle* handle = static_cast(clientCallBackInfo); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream WriteCallback (%p, %p, %lu, %p)", handle, - stream, type, clientCallBackInfo); + VLOG(2) << "CFStream WriteCallback (" << handle << ", " << stream << ", " + << type << ", " << clientCallBackInfo << ")"; } switch (type) { case kCFStreamEventOpenCompleted: @@ -176,9 +178,8 @@ void CFStreamHandle::Shutdown(grpc_error_handle error) { void CFStreamHandle::Ref(const char* file, int line, const char* reason) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&refcount_.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "CFStream Handle ref %p : %s %" PRIdPTR " -> %" PRIdPTR, this, - reason, val, val + 1); + VLOG(2).AtLocation(file, line) << "CFStream Handle ref " << this << " : " + << reason << " " << val << " -> " << val + 1; } gpr_ref(&refcount_); } @@ -186,9 +187,8 @@ void CFStreamHandle::Ref(const char* file, int line, const char* reason) { void CFStreamHandle::Unref(const char* file, int line, const char* reason) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&refcount_.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "CFStream Handle unref %p : %s %" PRIdPTR " -> %" PRIdPTR, this, - reason, val, val - 1); + VLOG(2).AtLocation(file, line) << "CFStream Handle unref " << this << " : " + << reason << " " << val << " -> " << val - 1; } if (gpr_unref(&refcount_)) { delete this; diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index efdb25f2fd..bebdb41a0a 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -23,9 +23,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include #include "src/core/lib/gprpp/crash.h" @@ -293,16 +293,16 @@ class Closure { } #ifndef NDEBUG if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "running closure %p: created [%s:%d]: run [%s:%d]", - closure, closure->file_created, closure->line_created, - location.file(), location.line()); + VLOG(2) << "running closure " << closure << ": created [" + << closure->file_created << ":" << closure->line_created + << "]: run [" << location.file() << ":" << location.line() << "]"; } CHECK_NE(closure->cb, nullptr); #endif closure->cb(closure->cb_arg, error); #ifndef NDEBUG if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "closure %p finished", closure); + VLOG(2) << "closure " << closure << " finished"; } #endif } diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index 348df4a0cb..7032c40f76 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -23,9 +23,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include #include "src/core/lib/experiments/experiments.h" @@ -34,13 +34,6 @@ #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" -#define GRPC_COMBINER_TRACE(fn) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(combiner)) { \ - fn; \ - } \ - } while (0) - #define STATE_UNORPHANED 1 #define STATE_ELEM_COUNT_LOW_BIT 2 @@ -58,32 +51,33 @@ grpc_core::Combiner* grpc_combiner_create( gpr_ref_init(&lock->refs, 1); gpr_atm_no_barrier_store(&lock->state, STATE_UNORPHANED); grpc_closure_list_init(&lock->final_list); - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p create", lock)); + GRPC_TRACE_LOG(combiner, INFO) << "C:" << lock << " create"; return lock; } static void really_destroy(grpc_core::Combiner* lock) { - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p really_destroy", lock)); + GRPC_TRACE_LOG(combiner, INFO) << "C:" << lock << " really_destroy"; CHECK_EQ(gpr_atm_no_barrier_load(&lock->state), 0); delete lock; } static void start_destroy(grpc_core::Combiner* lock) { gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_UNORPHANED); - GRPC_COMBINER_TRACE(gpr_log( - GPR_INFO, "C:%p really_destroy old_state=%" PRIdPTR, lock, old_state)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " really_destroy old_state=" << old_state; if (old_state == 1) { really_destroy(lock); } } #ifndef NDEBUG -#define GRPC_COMBINER_DEBUG_SPAM(op, delta) \ - if (GRPC_TRACE_FLAG_ENABLED(combiner)) { \ - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, \ - "C:%p %s %" PRIdPTR " --> %" PRIdPTR " %s", lock, (op), \ - gpr_atm_no_barrier_load(&lock->refs.count), \ - gpr_atm_no_barrier_load(&lock->refs.count) + (delta), reason); \ +#define GRPC_COMBINER_DEBUG_SPAM(op, delta) \ + if (GRPC_TRACE_FLAG_ENABLED(combiner)) { \ + VLOG(2).AtLocation(file, line) \ + << "C:" << lock << " " << (op) << " " \ + << gpr_atm_no_barrier_load(&lock->refs.count) << " --> " \ + << gpr_atm_no_barrier_load(&lock->refs.count) + (delta) << " " \ + << reason; \ } #else #define GRPC_COMBINER_DEBUG_SPAM(op, delta) @@ -128,9 +122,8 @@ static void push_first_on_exec_ctx(grpc_core::Combiner* lock) { static void combiner_exec(grpc_core::Combiner* lock, grpc_closure* cl, grpc_error_handle error) { gpr_atm last = gpr_atm_full_fetch_add(&lock->state, STATE_ELEM_COUNT_LOW_BIT); - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, - "C:%p grpc_combiner_execute c=%p last=%" PRIdPTR, - lock, cl, last)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " grpc_combiner_execute c=" << cl << " last=" << last; if (last == 1) { gpr_atm_no_barrier_store( &lock->initiating_exec_ctx_or_null, @@ -169,7 +162,7 @@ static void queue_offload(grpc_core::Combiner* lock) { // Make the combiner look uncontended by storing a non-null value here, so // that we don't immediately offload again. gpr_atm_no_barrier_store(&lock->initiating_exec_ctx_or_null, 1); - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, "C:%p queue_offload", lock)); + GRPC_TRACE_LOG(combiner, INFO) << "C:" << lock << " queue_offload"; lock->event_engine->Run([lock] { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx(0); @@ -188,14 +181,11 @@ bool grpc_combiner_continue_exec_ctx() { bool contended = gpr_atm_no_barrier_load(&lock->initiating_exec_ctx_or_null) == 0; - GRPC_COMBINER_TRACE(gpr_log(GPR_INFO, - "C:%p grpc_combiner_continue_exec_ctx " - "contended=%d " - "exec_ctx_ready_to_finish=%d " - "time_to_execute_final_list=%d", - lock, contended, - grpc_core::ExecCtx::Get()->IsReadyToFinish(), - lock->time_to_execute_final_list)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " grpc_combiner_continue_exec_ctx " + << "contended=" << contended << " exec_ctx_ready_to_finish=" + << grpc_core::ExecCtx::Get()->IsReadyToFinish() + << " time_to_execute_final_list=" << lock->time_to_execute_final_list; // offload only if both (1) the combiner is contended and has more than one // closure to execute, and (2) the current execution context needs to finish @@ -212,8 +202,9 @@ bool grpc_combiner_continue_exec_ctx() { // priority (gpr_atm_acq_load(&lock->state) >> 1) > 1) { grpc_core::MultiProducerSingleConsumerQueue::Node* n = lock->queue.Pop(); - GRPC_COMBINER_TRACE( - gpr_log(GPR_INFO, "C:%p maybe_finish_one n=%p", lock, n)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " maybe_finish_one n=" << n; + if (n == nullptr) { // queue is in an inconsistent state: use this as a cue that we should // go off and do something else for a while (and come back later) @@ -234,8 +225,8 @@ bool grpc_combiner_continue_exec_ctx() { grpc_closure_list_init(&lock->final_list); int loops = 0; while (c != nullptr) { - GRPC_COMBINER_TRACE( - gpr_log(GPR_INFO, "C:%p execute_final[%d] c=%p", lock, loops, c)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " execute_final[" << loops << "] c=" << c; grpc_closure* next = c->next_data.next; #ifndef NDEBUG c->scheduled = false; @@ -252,8 +243,8 @@ bool grpc_combiner_continue_exec_ctx() { lock->time_to_execute_final_list = false; gpr_atm old_state = gpr_atm_full_fetch_add(&lock->state, -STATE_ELEM_COUNT_LOW_BIT); - GRPC_COMBINER_TRACE( - gpr_log(GPR_INFO, "C:%p finish old_state=%" PRIdPTR, lock, old_state)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " finish old_state=" << old_state; // Define a macro to ease readability of the following switch statement. #define OLD_STATE_WAS(orphaned, elem_count) \ (((orphaned) ? 0 : STATE_UNORPHANED) | \ @@ -294,9 +285,9 @@ static void combiner_finally_exec(grpc_core::Combiner* lock, grpc_closure* closure, grpc_error_handle error) { CHECK_NE(lock, nullptr); - GRPC_COMBINER_TRACE(gpr_log( - GPR_INFO, "C:%p grpc_combiner_execute_finally c=%p; ac=%p", lock, closure, - grpc_core::ExecCtx::Get()->combiner_data()->active_combiner)); + GRPC_TRACE_LOG(combiner, INFO) + << "C:" << lock << " grpc_combiner_execute_finally c=" << closure + << "; ac=" << grpc_core::ExecCtx::Get()->combiner_data()->active_combiner; if (grpc_core::ExecCtx::Get()->combiner_data()->active_combiner != lock) { // Using error_data.scratch to store the combiner so that it can be accessed // in enqueue_finally. diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h index a0f5d8429f..c4b70abe4f 100644 --- a/src/core/lib/iomgr/endpoint.h +++ b/src/core/lib/iomgr/endpoint.h @@ -101,6 +101,8 @@ bool grpc_endpoint_can_track_err(grpc_endpoint* ep); struct grpc_endpoint { const grpc_endpoint_vtable* vtable; + + void Orphan() { grpc_endpoint_destroy(this); } }; #endif // GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H diff --git a/src/core/lib/iomgr/endpoint_cfstream.cc b/src/core/lib/iomgr/endpoint_cfstream.cc index 3ce89bf7aa..1cc776a13b 100644 --- a/src/core/lib/iomgr/endpoint_cfstream.cc +++ b/src/core/lib/iomgr/endpoint_cfstream.cc @@ -25,6 +25,7 @@ #import #include "absl/log/check.h" +#include "absl/log/log.h" #include #include @@ -75,9 +76,8 @@ static void CFStreamUnref(CFStreamEndpoint* ep, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->refcount.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "CFStream endpoint unref %p : %s %" PRIdPTR " -> %" PRIdPTR, ep, - reason, val, val - 1); + VLOG(2) << "CFStream endpoint unref " << ep << " : " << reason << " " << val + << " -> " << val - 1; } if (gpr_unref(&ep->refcount)) { CFStreamFree(ep); @@ -87,9 +87,8 @@ static void CFStreamRef(CFStreamEndpoint* ep, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&ep->refcount.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "CFStream endpoint ref %p : %s %" PRIdPTR " -> %" PRIdPTR, ep, - reason, val, val + 1); + VLOG(2) << "CFStream endpoint ref " << ep << " : " << reason << " " << val + << " -> " << val + 1; } gpr_ref(&ep->refcount); } @@ -111,17 +110,15 @@ static grpc_error_handle CFStreamAnnotateError(grpc_error_handle src_error) { static void CallReadCb(CFStreamEndpoint* ep, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(tcp) && ABSL_VLOG_IS_ON(2)) { - 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); + VLOG(2) << "CFStream endpoint:" << ep << " call_read_cb " << ep->read_cb + << " " << ep->read_cb->cb << ":" << ep->read_cb->cb_arg; size_t i; - gpr_log(GPR_DEBUG, "read: error=%s", - grpc_core::StatusToString(error).c_str()); + VLOG(2) << "read: error=" << grpc_core::StatusToString(error); for (i = 0; i < ep->read_slices->count; i++) { char* dump = grpc_dump_slice(ep->read_slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "READ %p (peer=%s): %s", ep, ep->peer_string.c_str(), - dump); + VLOG(2) << "READ " << ep << " (peer=" << ep->peer_string << "): " << dump; gpr_free(dump); } } @@ -133,10 +130,9 @@ static void CallReadCb(CFStreamEndpoint* ep, grpc_error_handle error) { static void CallWriteCb(CFStreamEndpoint* ep, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - 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); - gpr_log(GPR_DEBUG, "write: error=%s", - grpc_core::StatusToString(error).c_str()); + VLOG(2) << "CFStream endpoint:" << ep << " call_write_cb " << ep->write_cb + << " " << ep->write_cb->cb << ":" << ep->write_cb->cb_arg; + VLOG(2) << "write: error=" << grpc_core::StatusToString(error); } grpc_closure* cb = ep->write_cb; ep->write_cb = nullptr; @@ -224,8 +220,8 @@ static void WriteAction(void* arg, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(tcp) && ABSL_VLOG_IS_ON(2)) { grpc_slice trace_slice = grpc_slice_sub(slice, 0, write_size); char* dump = grpc_dump_slice(trace_slice, GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "WRITE %p (peer=%s): %s", ep, ep->peer_string.c_str(), - dump); + VLOG(2) << "WRITE " << ep << " (peer=" << ep->peer_string + << "): " << dump; gpr_free(dump); grpc_core::CSliceUnref(trace_slice); } @@ -238,8 +234,8 @@ static void CFStreamRead(grpc_endpoint* ep, grpc_slice_buffer* slices, int /*min_progress_size*/) { CFStreamEndpoint* ep_impl = reinterpret_cast(ep); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream endpoint:%p read (%p, %p) length:%zu", ep_impl, - slices, cb, slices->length); + VLOG(2) << "CFStream endpoint:" << ep_impl << " read (" << slices << ", " + << cb << ") length:" << slices->length; } CHECK_EQ(ep_impl->read_cb, nullptr); ep_impl->read_cb = cb; @@ -256,8 +252,8 @@ static void CFStreamWrite(grpc_endpoint* ep, grpc_slice_buffer* slices, int /*max_frame_size*/) { CFStreamEndpoint* ep_impl = reinterpret_cast(ep); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CFStream endpoint:%p write (%p, %p) length:%zu", - ep_impl, slices, cb, slices->length); + VLOG(2) << "CFStream endpoint:" << ep_impl << " write (" << slices << ", " + << cb << ") length:" << slices->length; } CHECK_EQ(ep_impl->write_cb, nullptr); ep_impl->write_cb = cb; @@ -313,9 +309,9 @@ grpc_endpoint* grpc_cfstream_endpoint_create(CFReadStreamRef read_stream, CFStreamHandle* stream_sync) { CFStreamEndpoint* ep_impl = new CFStreamEndpoint; if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, - "CFStream endpoint:%p create readStream:%p writeStream: %p", - ep_impl, read_stream, write_stream); + VLOG(2) << "CFStream endpoint:" << ep_impl + << " create readStream:" << read_stream + << " writeStream: " << write_stream; } ep_impl->base.vtable = &vtable; gpr_ref_init(&ep_impl->refcount, 1); diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc index c238a6db71..2fd37b4127 100644 --- a/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -66,13 +66,13 @@ static void create_sockets(SOCKET sv[2]) { closesocket(lst_sock); grpc_error_handle error = grpc_tcp_prepare_socket(cli_sock); if (!error.ok()) { - LOG(INFO) << "Prepare cli_sock failed with error: " - << grpc_core::StatusToString(error); + VLOG(2) << "Prepare cli_sock failed with error: " + << grpc_core::StatusToString(error); } error = grpc_tcp_prepare_socket(svr_sock); if (!error.ok()) { - LOG(INFO) << "Prepare svr_sock failed with error: " - << grpc_core::StatusToString(error); + VLOG(2) << "Prepare svr_sock failed with error: " + << grpc_core::StatusToString(error); } sv[1] = cli_sock; diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index d646b9a8a5..d130383455 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -21,12 +21,12 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include #include -#include #include #include @@ -221,7 +221,7 @@ grpc_error_handle grpc_error_add_child(grpc_error_handle src, bool grpc_log_error(const char* what, grpc_error_handle error, const char* file, int line) { DCHECK(!error.ok()); - gpr_log(file, line, GPR_LOG_SEVERITY_ERROR, "%s: %s", what, - grpc_core::StatusToString(error).c_str()); + LOG(ERROR).AtLocation(file, line) + << what << ": " << grpc_core::StatusToString(error); return false; } diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc index f0b205314e..77a9c4ee8e 100644 --- a/src/core/lib/iomgr/ev_apple.cc +++ b/src/core/lib/iomgr/ev_apple.cc @@ -40,9 +40,9 @@ #include "src/core/lib/iomgr/ev_apple.h" #ifndef NDEBUG -#define GRPC_POLLING_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(apple_polling)) { \ - gpr_log(GPR_DEBUG, "(polling) " format, __VA_ARGS__); \ +#define GRPC_POLLING_TRACE(format, ...) \ + if (GRPC_TRACE_FLAG_ENABLED(apple_polling)) { \ + VLOG(2) << "(polling) " << absl::StrFormat(format, __VA_ARGS__); \ } #else #define GRPC_POLLING_TRACE(...) diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index bf266705d9..6217ba2666 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -16,9 +16,6 @@ // // -#include "absl/log/check.h" - -#include #include #include "src/core/lib/gprpp/crash.h" @@ -41,6 +38,7 @@ #include #include +#include "absl/log/check.h" #include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -122,7 +120,7 @@ static bool epoll_set_init() { return false; } - gpr_log(GPR_INFO, "grpc epoll fd: %d", g_epoll_set.epfd); + GRPC_TRACE_LOG(polling, INFO) << "grpc epoll fd: " << g_epoll_set.epfd; gpr_atm_no_barrier_store(&g_epoll_set.num_events, 0); gpr_atm_no_barrier_store(&g_epoll_set.cursor, 0); return true; @@ -363,7 +361,7 @@ static grpc_fd* fd_create(int fd, const char* name, bool track_err) { fork_fd_list_add_grpc_fd(new_fd); #ifndef NDEBUG if (GRPC_TRACE_FLAG_ENABLED(fd_refcount)) { - gpr_log(GPR_DEBUG, "FD %d %p create %s", fd, new_fd, fd_name.c_str()); + VLOG(2) << "FD " << fd << " " << new_fd << " create " << fd_name; } #endif @@ -377,8 +375,7 @@ static grpc_fd* fd_create(int fd, const char* name, bool track_err) { ev.data.ptr = reinterpret_cast(reinterpret_cast(new_fd) | (track_err ? 1 : 0)); if (epoll_ctl(g_epoll_set.epfd, EPOLL_CTL_ADD, fd, &ev) != 0) { - gpr_log(GPR_ERROR, "epoll_ctl failed: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "epoll_ctl failed: " << grpc_core::StrError(errno); } return new_fd; @@ -401,8 +398,7 @@ static void fd_shutdown_internal(grpc_fd* fd, grpc_error_handle why, 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", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "epoll_ctl failed: " << grpc_core::StrError(errno); } } fd->write_closure->SetShutdown(why); @@ -732,7 +728,7 @@ static grpc_error_handle do_epoll_wait(grpc_pollset* ps, if (r < 0) return GRPC_OS_ERROR(errno, "epoll_wait"); if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "ps: %p poll got %d events", ps, r); + LOG(INFO) << "ps: " << ps << " poll got " << r << " events"; } gpr_atm_rel_store(&g_epoll_set.num_events, r); @@ -751,7 +747,7 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, pollset->begin_refs++; if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "PS:%p BEGIN_STARTS:%p", pollset, worker); + LOG(INFO) << "PS:" << pollset << " BEGIN_STARTS:" << worker; } if (pollset->seen_inactive) { @@ -770,9 +766,9 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, gpr_mu_lock(&neighborhood->mu); gpr_mu_lock(&pollset->mu); if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "PS:%p BEGIN_REORG:%p kick_state=%s is_reassigning=%d", - pollset, worker, kick_state_string(worker->state), - is_reassigning); + LOG(INFO) << "PS:" << pollset << " BEGIN_REORG:" << worker + << " kick_state=" << kick_state_string(worker->state) + << " is_reassigning=" << is_reassigning; } if (pollset->seen_inactive) { if (neighborhood != pollset->neighborhood) { @@ -823,9 +819,9 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, gpr_cv_init(&worker->cv); while (worker->state == UNKICKED && !pollset->shutting_down) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "PS:%p BEGIN_WAIT:%p kick_state=%s shutdown=%d", - pollset, worker, kick_state_string(worker->state), - pollset->shutting_down); + LOG(INFO) << "PS:" << pollset << " BEGIN_WAIT:" << worker + << " kick_state=" << kick_state_string(worker->state) + << " shutdown=" << pollset->shutting_down; } if (gpr_cv_wait(&worker->cv, &pollset->mu, @@ -840,11 +836,10 @@ static bool begin_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, } if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, - "PS:%p BEGIN_DONE:%p kick_state=%s shutdown=%d " - "kicked_without_poller: %d", - pollset, worker, kick_state_string(worker->state), - pollset->shutting_down, pollset->kicked_without_poller); + LOG(INFO) << "PS:" << pollset << " BEGIN_DONE:" << worker + << " kick_state=" << kick_state_string(worker->state) + << " shutdown=" << pollset->shutting_down + << " kicked_without_poller: " << pollset->kicked_without_poller; } // We release pollset lock in this function at a couple of places: @@ -883,8 +878,7 @@ static bool check_neighborhood_for_available_poller( &g_active_poller, 0, reinterpret_cast(inspect_worker))) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. choose next poller to be %p", - inspect_worker); + LOG(INFO) << " .. choose next poller to be " << inspect_worker; } SET_KICK_STATE(inspect_worker, DESIGNATED_POLLER); if (inspect_worker->initialized_cv) { @@ -910,7 +904,7 @@ static bool check_neighborhood_for_available_poller( } if (!found_worker) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. mark pollset %p inactive", inspect); + LOG(INFO) << " .. mark pollset " << inspect << " inactive"; } inspect->seen_inactive = true; if (inspect == neighborhood->active_root) { @@ -929,7 +923,7 @@ static bool check_neighborhood_for_available_poller( static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, grpc_pollset_worker** worker_hdl) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "PS:%p END_WORKER:%p", pollset, worker); + LOG(INFO) << "PS:" << pollset << " END_WORKER:" << worker; } if (worker_hdl != nullptr) *worker_hdl = nullptr; // Make sure we appear kicked @@ -940,7 +934,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, reinterpret_cast(worker)) { if (worker->next != worker && worker->next->state == UNKICKED) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. choose next poller to be peer %p", worker); + LOG(INFO) << " .. choose next poller to be peer " << worker; } CHECK(worker->next->initialized_cv); gpr_atm_no_barrier_store(&g_active_poller, (gpr_atm)worker->next); @@ -1073,7 +1067,7 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, log.push_back(absl::StrFormat(" worker_kick_state=%s", kick_state_string(specific_worker->state))); } - gpr_log(GPR_DEBUG, "%s", absl::StrJoin(log, "").c_str()); + VLOG(2) << absl::StrJoin(log, ""); } if (specific_worker == nullptr) { @@ -1089,13 +1083,13 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, grpc_pollset_worker* next_worker = root_worker->next; if (root_worker->state == KICKED) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. already kicked %p", root_worker); + LOG(INFO) << " .. already kicked " << root_worker; } SET_KICK_STATE(root_worker, KICKED); goto done; } else if (next_worker->state == KICKED) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. already kicked %p", next_worker); + LOG(INFO) << " .. already kicked " << next_worker; } SET_KICK_STATE(next_worker, KICKED); goto done; @@ -1105,14 +1099,14 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, reinterpret_cast( gpr_atm_no_barrier_load(&g_active_poller))) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. kicked %p", root_worker); + LOG(INFO) << " .. kicked " << root_worker; } SET_KICK_STATE(root_worker, KICKED); ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); goto done; } else if (next_worker->state == UNKICKED) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. kicked %p", next_worker); + LOG(INFO) << " .. kicked " << next_worker; } CHECK(next_worker->initialized_cv); SET_KICK_STATE(next_worker, KICKED); @@ -1121,10 +1115,9 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, } else if (next_worker->state == DESIGNATED_POLLER) { if (root_worker->state != DESIGNATED_POLLER) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log( - GPR_INFO, - " .. kicked root non-poller %p (initialized_cv=%d) (poller=%p)", - root_worker, root_worker->initialized_cv, next_worker); + LOG(INFO) << " .. kicked root non-poller " << root_worker + << " (initialized_cv=" << root_worker->initialized_cv + << ") (poller=" << next_worker << ")"; } SET_KICK_STATE(root_worker, KICKED); if (root_worker->initialized_cv) { @@ -1133,8 +1126,8 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, goto done; } else { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. non-root poller %p (root=%p)", next_worker, - root_worker); + LOG(INFO) << " .. non-root poller " << next_worker + << " (root=" << root_worker << ")"; } SET_KICK_STATE(next_worker, KICKED); ret_err = grpc_wakeup_fd_wakeup(&global_wakeup_fd); @@ -1162,7 +1155,7 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, goto done; } else if (g_current_thread_worker == specific_worker) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, " .. mark %p kicked", specific_worker); + LOG(INFO) << " .. mark " << specific_worker << " kicked"; } SET_KICK_STATE(specific_worker, KICKED); goto done; diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 049787596d..b2a3068633 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -39,7 +39,6 @@ #include "absl/strings/str_format.h" #include -#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/thd.h" @@ -334,10 +333,10 @@ static void fork_fd_list_add_wakeup_fd(grpc_cached_wakeup_fd* fd) { static void ref_by(grpc_fd* fd, int n, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(fd_refcount)) { - gpr_log(GPR_DEBUG, - "FD %d %p ref %d %" PRIdPTR " -> %" PRIdPTR " [%s; %s:%d]", - fd->fd, fd, n, gpr_atm_no_barrier_load(&fd->refst), - gpr_atm_no_barrier_load(&fd->refst) + n, reason, file, line); + VLOG(2) << "FD " << fd->fd << " " << fd << " ref " << n << " " + << gpr_atm_no_barrier_load(&fd->refst) << " -> " + << gpr_atm_no_barrier_load(&fd->refst) + n << " [" << reason << "; " + << file << ":" << line << "]"; } #else #define REF_BY(fd, n, reason) \ @@ -359,10 +358,10 @@ static void ref_by(grpc_fd* fd, int n) { static void unref_by(grpc_fd* fd, int n, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(fd_refcount)) { - gpr_log(GPR_DEBUG, - "FD %d %p unref %d %" PRIdPTR " -> %" PRIdPTR " [%s; %s:%d]", - fd->fd, fd, n, gpr_atm_no_barrier_load(&fd->refst), - gpr_atm_no_barrier_load(&fd->refst) - n, reason, file, line); + VLOG(2) << "FD " << fd->fd << " " << fd << " unref " << n << " " + << gpr_atm_no_barrier_load(&fd->refst) << " -> " + << gpr_atm_no_barrier_load(&fd->refst) - n << " [" << reason << "; " + << file << ":" << line << "]"; } #else static void unref_by(grpc_fd* fd, int n) { @@ -1030,7 +1029,7 @@ static grpc_error_handle pollset_work(grpc_pollset* pollset, GRPC_SCHEDULING_END_BLOCKING_REGION; if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "%p poll=%d", pollset, r); + LOG(INFO) << pollset << " poll=" << r; } if (r < 0) { @@ -1054,7 +1053,7 @@ static grpc_error_handle pollset_work(grpc_pollset* pollset, } else { if (pfds[0].revents & POLLIN_CHECK) { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "%p: got_wakeup", pollset); + LOG(INFO) << pollset << ": got_wakeup"; } work_combine_error( &error, grpc_wakeup_fd_consume_wakeup(&worker.wakeup_fd->fd)); @@ -1068,9 +1067,10 @@ static grpc_error_handle pollset_work(grpc_pollset* pollset, fd_end_poll(&watchers[i], 0, 0); } else { if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_INFO, "%p got_event: %d r:%d w:%d [%d]", pollset, - pfds[i].fd, (pfds[i].revents & POLLIN_CHECK) != 0, - (pfds[i].revents & POLLOUT_CHECK) != 0, pfds[i].revents); + LOG(INFO) << pollset << " got_event: " << pfds[i].fd + << " r:" << ((pfds[i].revents & POLLIN_CHECK) != 0) + << " w:" << ((pfds[i].revents & POLLOUT_CHECK) != 0) + << " [" << pfds[i].revents << "]"; } // This is a mitigation to prevent poll() from spinning on a //* POLLHUP https://github.com/grpc/grpc/pull/13665 diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index e60dd68524..d7206d421c 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -46,9 +46,9 @@ // Polling API trace only enabled in debug builds #ifndef NDEBUG -#define GRPC_POLLING_API_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(polling_api)) { \ - gpr_log(GPR_INFO, "(polling-api) " format, __VA_ARGS__); \ +#define GRPC_POLLING_API_TRACE(format, ...) \ + if (GRPC_TRACE_FLAG_ENABLED(polling_api)) { \ + LOG(INFO) << "(polling-api) " << absl::StrFormat(format, __VA_ARGS__); \ } #else #define GRPC_POLLING_API_TRACE(...) @@ -104,7 +104,8 @@ static void try_engine(absl::string_view engine) { if (g_vtables[i] != nullptr && is(engine, g_vtables[i]->name) && g_vtables[i]->check_engine_available(engine == g_vtables[i]->name)) { g_event_engine = g_vtables[i]; - VLOG(2) << "Using polling engine: " << g_event_engine->name; + GRPC_TRACE_VLOG(polling_api, 2) + << "Using polling engine: " << g_event_engine->name; return; } } diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h index bbacc4813a..06d039faf3 100644 --- a/src/core/lib/iomgr/ev_posix.h +++ b/src/core/lib/iomgr/ev_posix.h @@ -33,9 +33,9 @@ #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" -#define GRPC_FD_TRACE(format, ...) \ - if (GRPC_TRACE_FLAG_ENABLED(fd_trace)) { \ - gpr_log(GPR_INFO, "(fd-trace) " format, __VA_ARGS__); \ +#define GRPC_FD_TRACE(format, ...) \ + if (GRPC_TRACE_FLAG_ENABLED(fd_trace)) { \ + LOG(INFO) << "(fd-trace) " << absl::StrFormat(format, __VA_ARGS__); \ } typedef struct grpc_fd grpc_fd; diff --git a/src/core/lib/iomgr/event_engine_shims/closure.cc b/src/core/lib/iomgr/event_engine_shims/closure.cc index 4e67097b46..e38b295bba 100644 --- a/src/core/lib/iomgr/event_engine_shims/closure.cc +++ b/src/core/lib/iomgr/event_engine_shims/closure.cc @@ -14,6 +14,7 @@ #include "src/core/lib/iomgr/event_engine_shims/closure.h" #include "absl/functional/any_invocable.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include @@ -35,17 +36,16 @@ void RunEventEngineClosure(grpc_closure* closure, grpc_error_handle error) { #ifndef NDEBUG closure->scheduled = false; if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, - "EventEngine: running closure %p: created [%s:%d]: %s [%s:%d]", - closure, closure->file_created, closure->line_created, - closure->run ? "run" : "scheduled", closure->file_initiated, - closure->line_initiated); + VLOG(2) << "EventEngine: running closure " << closure << ": created [" + << closure->file_created << ":" << closure->line_created + << "]: " << (closure->run ? "run" : "scheduled") << " [" + << closure->file_initiated << ":" << closure->line_initiated << "]"; } #endif closure->cb(closure->cb_arg, error); #ifndef NDEBUG if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "EventEngine: closure %p finished", closure); + VLOG(2) << "EventEngine: closure " << closure << " finished"; } #endif } diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc index f83db8ea87..5b71ec378f 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -28,16 +28,14 @@ #include #include #include -#include #include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/extensions/can_track_errors.h" #include "src/core/lib/event_engine/extensions/supports_fd.h" #include "src/core/lib/event_engine/query_extensions.h" -#include "src/core/lib/event_engine/shim.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/gprpp/construct_destruct.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/sync.h" @@ -121,8 +119,7 @@ class EventEngineEndpointWrapper { read_buffer->~SliceBuffer(); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { size_t i; - gpr_log(GPR_INFO, "TCP: %p READ error=%s", eeep_->wrapper, - status.ToString().c_str()); + LOG(INFO) << "TCP: " << eeep_->wrapper << " READ error=" << status; if (ABSL_VLOG_IS_ON(2)) { for (i = 0; i < pending_read_buffer_->count; i++) { char* dump = grpc_dump_slice(pending_read_buffer_->slices[i], @@ -152,8 +149,7 @@ class EventEngineEndpointWrapper { Ref(); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { size_t i; - gpr_log(GPR_INFO, "TCP: %p WRITE (peer=%s)", this, - std::string(PeerAddress()).c_str()); + LOG(INFO) << "TCP: " << this << " WRITE (peer=" << PeerAddress() << ")"; if (ABSL_VLOG_IS_ON(2)) { for (i = 0; i < slices->count; i++) { char* dump = @@ -178,8 +174,8 @@ class EventEngineEndpointWrapper { auto* write_buffer = reinterpret_cast(&eeep_->write_buffer); write_buffer->~SliceBuffer(); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP: %p WRITE (peer=%s) error=%s", this, - std::string(PeerAddress()).c_str(), status.ToString().c_str()); + LOG(INFO) << "TCP: " << this << " WRITE (peer=" << PeerAddress() + << ") error=" << status; } grpc_closure* cb = pending_write_cb_; pending_write_cb_ = nullptr; @@ -353,7 +349,8 @@ void EndpointDestroy(grpc_endpoint* ep) { auto* eeep = reinterpret_cast( ep); - GRPC_EVENT_ENGINE_TRACE("EventEngine::Endpoint %p Destroy", eeep->wrapper); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::Endpoint::" << eeep->wrapper << " EndpointDestroy"; eeep->wrapper->TriggerShutdown(nullptr); eeep->wrapper->Unref(); } @@ -411,7 +408,8 @@ EventEngineEndpointWrapper::EventEngineEndpointWrapper( } else { fd_ = -1; } - GRPC_EVENT_ENGINE_TRACE("EventEngine::Endpoint %p Create", eeep_->wrapper); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::Endpoint " << eeep_->wrapper << " Create"; } } // namespace diff --git a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc index 640b3efb28..2880415e19 100644 --- a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc +++ b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc @@ -15,17 +15,15 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "absl/strings/str_cat.h" -#include "absl/strings/string_view.h" #include #include #include #include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/resolved_address_internal.h" -#include "src/core/lib/event_engine/trace.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -64,8 +62,8 @@ int64_t event_engine_tcp_client_connect( } else { *endpoint = nullptr; } - GRPC_EVENT_ENGINE_TRACE("EventEngine::Connect Status: %s", - ep.status().ToString().c_str()); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::Connect Status: " << ep.status(); grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_connect, absl_status_to_grpc_error(conn_status)); }, @@ -75,15 +73,14 @@ int64_t event_engine_tcp_client_connect( : grpc_event_engine::experimental::MemoryAllocator(), std::max(grpc_core::Duration::Milliseconds(1), deadline - grpc_core::Timestamp::Now())); - GRPC_EVENT_ENGINE_TRACE("EventEngine::Connect Peer: %s, handle: %" PRId64, - (*addr_uri).c_str(), - static_cast(handle.keys[0])); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::Connect Peer: " << *addr_uri << ", handle: " << handle; return handle.keys[0]; } bool event_engine_tcp_client_cancel_connect(int64_t connection_handle) { - GRPC_EVENT_ENGINE_TRACE("EventEngine::CancelConnect handle: %" PRId64, - connection_handle); + GRPC_TRACE_LOG(event_engine, INFO) + << "EventEngine::CancelConnect handle: " << connection_handle; return GetDefaultEventEngine()->CancelConnect( {static_cast(connection_handle), 0}); } diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc index aa7350b454..0a3ae056eb 100644 --- a/src/core/lib/iomgr/exec_ctx.cc +++ b/src/core/lib/iomgr/exec_ctx.cc @@ -19,9 +19,9 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" -#include #include #include @@ -33,10 +33,10 @@ static void exec_ctx_run(grpc_closure* closure) { #ifndef NDEBUG closure->scheduled = false; if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "running closure %p: created [%s:%d]: %s [%s:%d]", - closure, closure->file_created, closure->line_created, - closure->run ? "run" : "scheduled", closure->file_initiated, - closure->line_initiated); + VLOG(2) << "running closure " << closure << ": created [" + << closure->file_created << ":" << closure->line_created + << "]: " << (closure->run ? "run" : "scheduled") << " [" + << closure->file_initiated << ":" << closure->line_initiated << "]"; } #endif grpc_error_handle error = @@ -45,7 +45,7 @@ static void exec_ctx_run(grpc_closure* closure) { closure->cb(closure->cb_arg, std::move(error)); #ifndef NDEBUG if (GRPC_TRACE_FLAG_ENABLED(closure)) { - gpr_log(GPR_DEBUG, "closure %p finished", closure); + VLOG(2) << "closure " << closure << " finished"; } #endif } diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index ef6d01b1d6..22f1cb768b 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -21,6 +21,8 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" +#include "absl/strings/str_format.h" #include #include @@ -28,6 +30,7 @@ #include #include +#include "src/core/lib/debug/trace_impl.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -36,11 +39,11 @@ #define MAX_DEPTH 2 -#define EXECUTOR_TRACE(format, ...) \ - do { \ - if (GRPC_TRACE_FLAG_ENABLED(executor)) { \ - gpr_log(GPR_INFO, "EXECUTOR " format, __VA_ARGS__); \ - } \ +#define EXECUTOR_TRACE(format, ...) \ + do { \ + if (GRPC_TRACE_FLAG_ENABLED(executor)) { \ + LOG(INFO) << "EXECUTOR " << absl::StrFormat(format, __VA_ARGS__); \ + } \ } while (0) namespace grpc_core { diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc index 7b20767870..ab4f563979 100644 --- a/src/core/lib/iomgr/lockfree_event.cc +++ b/src/core/lib/iomgr/lockfree_event.cc @@ -19,8 +19,8 @@ #include "src/core/lib/iomgr/lockfree_event.h" #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include "src/core/lib/debug/trace.h" @@ -96,9 +96,8 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { // referencing it. gpr_atm curr = gpr_atm_acq_load(&state_); if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_DEBUG, - "LockfreeEvent::NotifyOn: %p curr=%" PRIxPTR " closure=%p", this, - curr, closure); + VLOG(2) << "LockfreeEvent::NotifyOn: " << this << " curr=" << curr + << " closure=" << closure; } switch (curr) { case kClosureNotReady: { @@ -165,9 +164,8 @@ bool LockfreeEvent::SetShutdown(grpc_error_handle shutdown_error) { while (true) { gpr_atm curr = gpr_atm_no_barrier_load(&state_); if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_DEBUG, - "LockfreeEvent::SetShutdown: %p curr=%" PRIxPTR " err=%s", - &state_, curr, StatusToString(shutdown_error).c_str()); + VLOG(2) << "LockfreeEvent::SetShutdown: " << &state_ << " curr=" << curr + << " err=" << StatusToString(shutdown_error); } switch (curr) { case kClosureReady: @@ -215,8 +213,7 @@ void LockfreeEvent::SetReady() { gpr_atm curr = gpr_atm_no_barrier_load(&state_); if (GRPC_TRACE_FLAG_ENABLED(polling)) { - gpr_log(GPR_DEBUG, "LockfreeEvent::SetReady: %p curr=%" PRIxPTR, &state_, - curr); + VLOG(2) << "LockfreeEvent::SetReady: " << &state_ << " curr=" << curr; } switch (curr) { diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index 017fc316f5..19c6ccab15 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -49,7 +49,6 @@ #include #include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -374,38 +373,36 @@ grpc_error_handle grpc_set_socket_tcp_user_timeout( // if it is available. if (g_socket_supports_tcp_user_timeout.load() == 0) { if (0 != getsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &newval, &len)) { - gpr_log(GPR_INFO, - "TCP_USER_TIMEOUT is not available. TCP_USER_TIMEOUT won't " - "be used thereafter"); + GRPC_TRACE_LOG(tcp, INFO) + << "TCP_USER_TIMEOUT is not available. TCP_USER_TIMEOUT won't be " + "used thereafter"; g_socket_supports_tcp_user_timeout.store(-1); } else { - gpr_log(GPR_INFO, - "TCP_USER_TIMEOUT is available. TCP_USER_TIMEOUT will be " - "used thereafter"); + GRPC_TRACE_LOG(tcp, INFO) + << "TCP_USER_TIMEOUT is available. TCP_USER_TIMEOUT will be used " + "thereafter"; g_socket_supports_tcp_user_timeout.store(1); } } if (g_socket_supports_tcp_user_timeout.load() > 0) { - if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "Enabling TCP_USER_TIMEOUT with a timeout of %d ms", - timeout); - } + GRPC_TRACE_LOG(tcp, INFO) + << "Enabling TCP_USER_TIMEOUT with a timeout of " << timeout + << " ms"; if (0 != setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &timeout, sizeof(timeout))) { - gpr_log(GPR_ERROR, "setsockopt(TCP_USER_TIMEOUT) %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "setsockopt(TCP_USER_TIMEOUT) " + << grpc_core::StrError(errno); return absl::OkStatus(); } if (0 != getsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &newval, &len)) { - gpr_log(GPR_ERROR, "getsockopt(TCP_USER_TIMEOUT) %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "getsockopt(TCP_USER_TIMEOUT) " + << grpc_core::StrError(errno); return absl::OkStatus(); } if (newval != timeout) { - gpr_log(GPR_INFO, - "Setting TCP_USER_TIMEOUT to value %d ms. Actual " - "TCP_USER_TIMEOUT value is %d ms", - timeout, newval); + GRPC_TRACE_LOG(tcp, INFO) + << "Setting TCP_USER_TIMEOUT to value " << timeout + << " ms. Actual TCP_USER_TIMEOUT value is " << newval << " ms"; return absl::OkStatus(); } } @@ -442,7 +439,8 @@ static void probe_ipv6_once(void) { int fd = socket(AF_INET6, SOCK_STREAM, 0); g_ipv6_loopback_available = 0; if (fd < 0) { - LOG(INFO) << "Disabling AF_INET6 sockets because socket() failed."; + GRPC_TRACE_LOG(tcp, INFO) + << "Disabling AF_INET6 sockets because socket() failed."; } else { grpc_sockaddr_in6 addr; memset(&addr, 0, sizeof(addr)); @@ -451,8 +449,8 @@ static void probe_ipv6_once(void) { if (bind(fd, reinterpret_cast(&addr), sizeof(addr)) == 0) { g_ipv6_loopback_available = 1; } else { - gpr_log(GPR_INFO, - "Disabling AF_INET6 sockets because ::1 is not available."); + GRPC_TRACE_LOG(tcp, INFO) + << "Disabling AF_INET6 sockets because ::1 is not available."; } close(fd); } @@ -482,14 +480,15 @@ static int create_socket(grpc_socket_factory* factory, int domain, int type, : socket(domain, type, protocol); if (res < 0 && errno == EMFILE) { int saved_errno = errno; - GRPC_LOG_EVERY_N_SEC( - 10, GPR_ERROR, - "socket(%d, %d, %d) returned %d with error: |%s|. This process " - "might not have a sufficient file descriptor limit for the number " - "of connections grpc wants to open (which is generally a function of " - "the number of grpc channels, the lb policy of each channel, and the " - "number of backends each channel is load balancing across).", - domain, type, protocol, res, grpc_core::StrError(errno).c_str()); + LOG_EVERY_N_SEC(ERROR, 10) + << "socket(" << domain << ", " << type << ", " << protocol + << ") returned " << res << " with error: |" + << grpc_core::StrError(errno) + << "|. This process might not have a sufficient file descriptor limit " + "for the number of connections grpc wants to open (which is " + "generally a function of the number of grpc channels, the lb policy " + "of each channel, and the number of backends each channel is load " + "balancing across)."; errno = saved_errno; } return res; diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index 3bd40480ba..e7a8b1e5fd 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -132,7 +132,7 @@ void grpc_winsocket_shutdown(grpc_winsocket* winsocket) { DisconnectEx(winsocket->socket, NULL, 0, 0); } else { char* utf8_message = gpr_format_message(WSAGetLastError()); - LOG(INFO) << "Unable to retrieve DisconnectEx pointer : " << utf8_message; + VLOG(2) << "Unable to retrieve DisconnectEx pointer : " << utf8_message; gpr_free(utf8_message); } // Calling closesocket triggers invocation of any pending I/O operations with @@ -216,7 +216,7 @@ static void probe_ipv6_once(void) { SOCKET s = socket(AF_INET6, SOCK_STREAM, 0); g_ipv6_loopback_available = 0; if (s == INVALID_SOCKET) { - LOG(INFO) << "Disabling AF_INET6 sockets because socket() failed."; + VLOG(2) << "Disabling AF_INET6 sockets because socket() failed."; } else { grpc_sockaddr_in6 addr; memset(&addr, 0, sizeof(addr)); @@ -225,7 +225,7 @@ static void probe_ipv6_once(void) { if (bind(s, reinterpret_cast(&addr), sizeof(addr)) == 0) { g_ipv6_loopback_available = 1; } else { - LOG(INFO) << "Disabling AF_INET6 sockets because ::1 is not available."; + VLOG(2) << "Disabling AF_INET6 sockets because ::1 is not available."; } closesocket(s); } diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc index f350703e4c..06c6a6fb48 100644 --- a/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -27,9 +27,10 @@ #include #include +#include "absl/log/log.h" + #include #include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -78,8 +79,8 @@ static void CFStreamConnectCleanup(CFStreamConnect* connect) { static void OnAlarm(void* arg, grpc_error_handle error) { CFStreamConnect* connect = static_cast(arg); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT :%p OnAlarm, error:%s", connect, - grpc_core::StatusToString(error).c_str()); + VLOG(2) << "CLIENT_CONNECT :" << connect + << " OnAlarm, error:" << grpc_core::StatusToString(error); } gpr_mu_lock(&connect->mu); grpc_closure* closure = connect->closure; @@ -99,8 +100,8 @@ static void OnAlarm(void* arg, grpc_error_handle error) { static void OnOpen(void* arg, grpc_error_handle error) { CFStreamConnect* connect = static_cast(arg); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT :%p OnOpen, error:%s", connect, - grpc_core::StatusToString(error).c_str()); + VLOG(2) << "CLIENT_CONNECT :" << connect + << " OnOpen, error:" << grpc_core::StatusToString(error); } gpr_mu_lock(&connect->mu); grpc_timer_cancel(&connect->alarm); @@ -173,8 +174,8 @@ static int64_t CFStreamClientConnect( gpr_mu_init(&connect->mu); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_DEBUG, "CLIENT_CONNECT: %p, %s: asynchronously connecting", - connect, connect->addr_name.c_str()); + VLOG(2) << "CLIENT_CONNECT: " << connect << ", " << connect->addr_name + << ": asynchronously connecting"; } CFReadStreamRef read_stream; diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index eed6762c44..eed4b78e36 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -34,7 +34,6 @@ #include "absl/strings/str_cat.h" #include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -143,8 +142,8 @@ static void tc_on_alarm(void* acp, grpc_error_handle error) { int done; async_connect* ac = static_cast(acp); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: on_alarm: error=%s", - ac->addr_str.c_str(), grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "CLIENT_CONNECT: " << ac->addr_str + << ": on_alarm: error=" << grpc_core::StatusToString(error); } gpr_mu_lock(&ac->mu); if (ac->fd != nullptr) { @@ -182,8 +181,8 @@ static void on_writable(void* acp, grpc_error_handle error) { grpc_fd* fd; if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: on_writable: error=%s", - ac->addr_str.c_str(), grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "CLIENT_CONNECT: " << ac->addr_str + << ": on_writable: error=" << grpc_core::StatusToString(error); } gpr_mu_lock(&ac->mu); @@ -383,8 +382,8 @@ int64_t grpc_tcp_client_create_from_prepared_fd( ac->options = options; if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: asynchronously connecting fd %p", - ac->addr_str.c_str(), fdobj); + LOG(INFO) << "CLIENT_CONNECT: " << ac->addr_str + << ": asynchronously connecting fd " << fdobj; } int shard_number = connection_id % (*g_connection_shards).size(); diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 86cfbe3dcc..f3ac9da0a3 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -50,7 +50,6 @@ #include #include -#include #include #include #include @@ -210,7 +209,8 @@ class TcpZerocopySendCtx { if (send_records_ == nullptr || free_send_records_ == nullptr) { gpr_free(send_records_); gpr_free(free_send_records_); - LOG(INFO) << "Disabling TCP TX zerocopy due to memory pressure.\n"; + GRPC_TRACE_LOG(tcp, INFO) + << "Disabling TCP TX zerocopy due to memory pressure.\n"; memory_limited_ = true; } else { for (int idx = 0; idx < max_sends_; ++idx) { @@ -593,9 +593,9 @@ void LogCommonIOErrors(absl::string_view prefix, int error_no) { return; default: grpc_core::global_stats().IncrementUncommonIoErrorCount(); - GRPC_LOG_EVERY_N_SEC(1, GPR_ERROR, "%s encountered uncommon error: %s", - prefix.data(), - grpc_core::StrError(error_no).c_str()); + LOG_EVERY_N_SEC(ERROR, 1) + << prefix.data() + << " encountered uncommon error: " << grpc_core::StrError(error_no); return; } } @@ -619,7 +619,7 @@ static void tcp_drop_uncovered_then_handle_write(void* arg /* grpc_tcp */, static void done_poller(void* bp, grpc_error_handle /*error_ignored*/) { backup_poller* p = static_cast(bp); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p destroy", p); + LOG(INFO) << "BACKUP_POLLER:" << p << " destroy"; } grpc_pollset_destroy(BACKUP_POLLER_POLLSET(p)); gpr_free(p); @@ -628,7 +628,7 @@ static void done_poller(void* bp, grpc_error_handle /*error_ignored*/) { static void run_poller(void* bp, grpc_error_handle /*error_ignored*/) { backup_poller* p = static_cast(bp); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p run", p); + LOG(INFO) << "BACKUP_POLLER:" << p << " run"; } gpr_mu_lock(p->pollset_mu); grpc_core::Timestamp deadline = @@ -645,7 +645,7 @@ static void run_poller(void* bp, grpc_error_handle /*error_ignored*/) { g_uncovered_notifications_pending = 0; g_backup_poller_mu->Unlock(); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p shutdown", p); + LOG(INFO) << "BACKUP_POLLER:" << p << " shutdown"; } grpc_pollset_shutdown(BACKUP_POLLER_POLLSET(p), GRPC_CLOSURE_INIT(&p->run_poller, done_poller, p, @@ -653,7 +653,7 @@ static void run_poller(void* bp, grpc_error_handle /*error_ignored*/) { } else { g_backup_poller_mu->Unlock(); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p reschedule", p); + LOG(INFO) << "BACKUP_POLLER:" << p << " reschedule"; } grpc_core::Executor::Run(&p->run_poller, absl::OkStatus(), grpc_core::ExecutorType::DEFAULT, @@ -670,8 +670,8 @@ static void drop_uncovered(grpc_tcp* /*tcp*/) { g_backup_poller_mu->Unlock(); CHECK_GT(old_count, 1); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p uncover cnt %d->%d", p, old_count, - old_count - 1); + LOG(INFO) << "BACKUP_POLLER:" << p << " uncover cnt " << old_count << "->" + << old_count - 1; } } @@ -694,7 +694,7 @@ static void cover_self(grpc_tcp* tcp) { grpc_pollset_init(BACKUP_POLLER_POLLSET(p), &p->pollset_mu); g_backup_poller_mu->Unlock(); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p create", p); + LOG(INFO) << "BACKUP_POLLER:" << p << " create"; } grpc_core::Executor::Run( GRPC_CLOSURE_INIT(&p->run_poller, run_poller, p, nullptr), @@ -706,22 +706,22 @@ static void cover_self(grpc_tcp* tcp) { g_backup_poller_mu->Unlock(); } if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "BACKUP_POLLER:%p add %p cnt %d->%d", p, tcp, - old_count - 1, old_count); + LOG(INFO) << "BACKUP_POLLER:" << p << " add " << tcp << " cnt " + << old_count - 1 << "->" << old_count; } grpc_pollset_add_fd(BACKUP_POLLER_POLLSET(p), tcp->em_fd); } static void notify_on_read(grpc_tcp* tcp) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p notify_on_read", tcp); + LOG(INFO) << "TCP:" << tcp << " notify_on_read"; } grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_done_closure); } static void notify_on_write(grpc_tcp* tcp) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p notify_on_write", tcp); + LOG(INFO) << "TCP:" << tcp << " notify_on_write"; } if (!grpc_event_engine_run_in_background()) { cover_self(tcp); @@ -732,8 +732,8 @@ static void notify_on_write(grpc_tcp* tcp) { static void tcp_drop_uncovered_then_handle_write(void* arg, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p got_write: %s", arg, - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "TCP:" << arg + << " got_write: " << grpc_core::StatusToString(error); } drop_uncovered(static_cast(arg)); tcp_handle_write(arg, error); @@ -806,7 +806,6 @@ static void tcp_ref(grpc_tcp* tcp) { tcp->refcount.Ref(); } #endif static void tcp_destroy(grpc_endpoint* ep) { - gpr_log(GPR_INFO, "IOMGR endpoint shutdown"); grpc_tcp* tcp = reinterpret_cast(ep); ZerocopyDisableAndWaitForRemaining(tcp); grpc_fd_shutdown(tcp->em_fd, absl::UnavailableError("endpoint shutdown")); @@ -853,10 +852,11 @@ static void tcp_trace_read(grpc_tcp* tcp, grpc_error_handle error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(tcp->read_mu) { grpc_closure* cb = tcp->read_cb; if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p call_cb %p %p:%p", tcp, cb, cb->cb, cb->cb_arg); + LOG(INFO) << "TCP:" << tcp << " call_cb " << cb << " " << cb->cb << ":" + << cb->cb_arg; size_t i; - gpr_log(GPR_INFO, "READ %p (peer=%s) error=%s", tcp, - tcp->peer_string.c_str(), grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "READ " << tcp << " (peer=" << tcp->peer_string + << ") error=" << grpc_core::StatusToString(error); if (ABSL_VLOG_IS_ON(2)) { for (i = 0; i < tcp->incoming_buffer->count; i++) { char* dump = grpc_dump_slice(tcp->incoming_buffer->slices[i], @@ -904,10 +904,8 @@ static void update_rcvlowat(grpc_tcp* tcp) } if (setsockopt(tcp->fd, SOL_SOCKET, SO_RCVLOWAT, &remaining, sizeof(remaining)) != 0) { - gpr_log(GPR_ERROR, "%s", - absl::StrCat("Cannot set SO_RCVLOWAT on fd=", tcp->fd, - " err=", grpc_core::StrError(errno).c_str()) - .c_str()); + LOG(ERROR) << "Cannot set SO_RCVLOWAT on fd=" << tcp->fd + << " err=" << grpc_core::StrError(errno); return; } tcp->set_rcvlowat = remaining; @@ -918,7 +916,7 @@ static void update_rcvlowat(grpc_tcp* tcp) static bool tcp_do_read(grpc_tcp* tcp, grpc_error_handle* error) ABSL_EXCLUSIVE_LOCKS_REQUIRED(tcp->read_mu) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p do_read", tcp); + LOG(INFO) << "TCP:" << tcp << " do_read"; } struct msghdr msg; struct iovec iov[MAX_READ_IOVEC]; @@ -1131,8 +1129,8 @@ static void maybe_make_read_slices(grpc_tcp* tcp) static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error_handle error) { grpc_tcp* tcp = static_cast(arg); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p got_read: %s", tcp, - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "TCP:" << tcp + << " got_read: " << grpc_core::StatusToString(error); } tcp->read_mu.Lock(); grpc_error_handle tcp_read_error; @@ -1472,9 +1470,8 @@ static bool process_errors(grpc_tcp* tcp) { // Got a control message that is not a timestamp or zerocopy. Don't know // how to handle this. if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, - "unknown control message cmsg_level:%d cmsg_type:%d", - cmsg->cmsg_level, cmsg->cmsg_type); + LOG(INFO) << "unknown control message cmsg_level:" << cmsg->cmsg_level + << " cmsg_type:" << cmsg->cmsg_type; } return processed_err; } @@ -1489,8 +1486,7 @@ static void tcp_handle_error(void* arg /* grpc_tcp */, grpc_error_handle error) { grpc_tcp* tcp = static_cast(arg); if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p got_error: %s", tcp, - grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "TCP:" << tcp << " got_error: " << error; } if (!error.ok() || @@ -1848,7 +1844,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, size_t i; for (i = 0; i < buf->count; i++) { - gpr_log(GPR_INFO, "WRITE %p (peer=%s)", tcp, tcp->peer_string.c_str()); + LOG(INFO) << "WRITE " << tcp << " (peer=" << tcp->peer_string << ")"; if (ABSL_VLOG_IS_ON(2)) { char* data = grpc_dump_slice(buf->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -2031,7 +2027,7 @@ grpc_endpoint* grpc_tcp_create(grpc_fd* em_fd, if (setsockopt(tcp->fd, SOL_TCP, TCP_INQ, &one, sizeof(one)) == 0) { tcp->inq_capable = true; } else { - gpr_log(GPR_DEBUG, "cannot set inq fd=%d errno=%d", tcp->fd, errno); + VLOG(2) << "cannot set inq fd=" << tcp->fd << " errno=" << errno; tcp->inq_capable = false; } #else diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc index 2828f69d20..14d5765489 100644 --- a/src/core/lib/iomgr/tcp_server_posix.cc +++ b/src/core/lib/iomgr/tcp_server_posix.cc @@ -44,6 +44,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -51,7 +52,6 @@ #include #include #include -#include #include #include @@ -165,22 +165,21 @@ static grpc_error_handle CreateEventEngineListener( ->GetWrappedFd(); if (getpeername(fd, reinterpret_cast(addr.addr), &(addr.len)) < 0) { - gpr_log(GPR_ERROR, "Failed getpeername: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "Failed getpeername: " + << grpc_core::StrError(errno); close(fd); return; } (void)grpc_set_socket_no_sigpipe_if_possible(fd); auto addr_uri = grpc_sockaddr_to_uri(&addr); if (!addr_uri.ok()) { - gpr_log(GPR_ERROR, "Invalid address: %s", - addr_uri.status().ToString().c_str()); + LOG(ERROR) << "Invalid address: " + << addr_uri.status().ToString(); return; } if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, - "SERVER_CONNECT: incoming external connection: %s", - addr_uri->c_str()); + LOG(INFO) << "SERVER_CONNECT: incoming external connection: " + << addr_uri->c_str(); } } read_notifier_pollset = @@ -395,8 +394,7 @@ static void on_read(void* arg, grpc_error_handle err) { // This is not a performant code path, but if an fd limit has been // reached, the system is likely in an unhappy state regardless. if (errno == EMFILE) { - GRPC_LOG_EVERY_N_SEC(1, GPR_ERROR, "%s", - "File descriptor limit reached. Retrying."); + LOG_EVERY_N_SEC(ERROR, 1) << "File descriptor limit reached. Retrying."; grpc_fd_notify_on_read(sp->emfd, &sp->read_closure); if (gpr_atm_full_xchg(&sp->retry_timer_armed, true)) return; grpc_timer_init(&sp->retry_timer, @@ -410,8 +408,7 @@ static void on_read(void* arg, grpc_error_handle err) { } gpr_mu_lock(&sp->server->mu); if (!sp->server->shutdown_listeners) { - gpr_log(GPR_ERROR, "Failed accept4: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "Failed accept4: " << grpc_core::StrError(errno); } else { // if we have shutdown listeners, accept4 could fail, and we // needn't notify users @@ -424,10 +421,9 @@ static void on_read(void* arg, grpc_error_handle err) { int64_t dropped_connections_count = num_dropped_connections.fetch_add(1, std::memory_order_relaxed) + 1; if (dropped_connections_count % 1000 == 1) { - gpr_log(GPR_INFO, - "Dropped >= %" PRId64 - " new connection attempts due to high memory pressure", - dropped_connections_count); + GRPC_TRACE_LOG(tcp, INFO) + << "Dropped >= " << dropped_connections_count + << " new connection attempts due to high memory pressure"; } close(fd); continue; @@ -441,13 +437,11 @@ static void on_read(void* arg, grpc_error_handle err) { if (getpeername(fd, reinterpret_cast(addr.addr), &(addr.len)) < 0) { auto listener_addr_uri = grpc_sockaddr_to_uri(&sp->addr); - gpr_log( - GPR_ERROR, - "Failed getpeername: %s. Dropping the connection, and continuing " - "to listen on %s:%d.", - grpc_core::StrError(errno).c_str(), - listener_addr_uri.ok() ? listener_addr_uri->c_str() : "", - sp->port); + LOG(ERROR) << "Failed getpeername: " << grpc_core::StrError(errno) + << ". Dropping the connection, and continuing to listen on " + << (listener_addr_uri.ok() ? *listener_addr_uri + : "") + << ":" << sp->port; close(fd); continue; } @@ -463,13 +457,11 @@ static void on_read(void* arg, grpc_error_handle err) { auto addr_uri = grpc_sockaddr_to_uri(&addr); if (!addr_uri.ok()) { - gpr_log(GPR_ERROR, "Invalid address: %s", - addr_uri.status().ToString().c_str()); + LOG(ERROR) << "Invalid address: " << addr_uri.status(); goto error; } if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "SERVER_CONNECT: incoming connection: %s", - addr_uri->c_str()); + LOG(INFO) << "SERVER_CONNECT: incoming connection: " << *addr_uri; } std::string name = absl::StrCat("tcp-server-connection:", addr_uri.value()); @@ -549,16 +541,14 @@ static grpc_error_handle add_wildcard_addrs_to_server(grpc_tcp_server* s, } if (*out_port > 0) { if (!v6_err.ok()) { - gpr_log(GPR_INFO, - "Failed to add :: listener, " - "the environment may not support IPv6: %s", - grpc_core::StatusToString(v6_err).c_str()); + GRPC_TRACE_LOG(tcp, INFO) << "Failed to add :: listener, " + << "the environment may not support IPv6: " + << grpc_core::StatusToString(v6_err); } if (!v4_err.ok()) { - gpr_log(GPR_INFO, - "Failed to add 0.0.0.0 listener, " - "the environment may not support IPv4: %s", - grpc_core::StatusToString(v4_err).c_str()); + GRPC_TRACE_LOG(tcp, INFO) << "Failed to add 0.0.0.0 listener, " + << "the environment may not support IPv4: " + << grpc_core::StatusToString(v4_err); } return absl::OkStatus(); } else { @@ -916,21 +906,19 @@ class ExternalConnectionHandler : public grpc_core::TcpServerFdHandler { if (getpeername(fd, reinterpret_cast(addr.addr), &(addr.len)) < 0) { - gpr_log(GPR_ERROR, "Failed getpeername: %s", - grpc_core::StrError(errno).c_str()); + LOG(ERROR) << "Failed getpeername: " << grpc_core::StrError(errno); close(fd); return; } (void)grpc_set_socket_no_sigpipe_if_possible(fd); auto addr_uri = grpc_sockaddr_to_uri(&addr); if (!addr_uri.ok()) { - gpr_log(GPR_ERROR, "Invalid address: %s", - addr_uri.status().ToString().c_str()); + LOG(ERROR) << "Invalid address: " << addr_uri.status(); return; } if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "SERVER_CONNECT: incoming external connection: %s", - addr_uri->c_str()); + LOG(INFO) << "SERVER_CONNECT: incoming external connection: " + << *addr_uri; } std::string name = absl::StrCat("tcp-server-connection:", addr_uri.value()); grpc_fd* fdobj = grpc_fd_create(fd, name.c_str(), true); diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 92b8a1f9a0..1e0bb260c4 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -386,8 +386,8 @@ static void on_accept(void* arg, grpc_error_handle 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.ok()) { - LOG(INFO) << "Skipping on_accept due to error: " - << grpc_core::StatusToString(error); + VLOG(2) << "Skipping on_accept due to error: " + << grpc_core::StatusToString(error); gpr_mu_unlock(&sp->server->mu); return; diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc index 7e4a2e2d60..0888f92ff1 100644 --- a/src/core/lib/iomgr/tcp_windows.cc +++ b/src/core/lib/iomgr/tcp_windows.cc @@ -29,8 +29,6 @@ #include #include -#include -#include #include #include "src/core/lib/address_utils/sockaddr_utils.h" @@ -142,9 +140,8 @@ static void tcp_unref(grpc_tcp* tcp, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "TCP unref %p : %s %" PRIdPTR " -> %" PRIdPTR, tcp, reason, val, - val - 1); + VLOG(2).AtLocation(file, line) << "TCP unref " << tcp << " : " << reason + << " " << val << " -> " << val - 1; } if (gpr_unref(&tcp->refcount)) { tcp_free(tcp); @@ -155,9 +152,8 @@ static void tcp_ref(grpc_tcp* tcp, const char* reason, const char* file, int line) { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { gpr_atm val = gpr_atm_no_barrier_load(&tcp->refcount.count); - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "TCP ref %p : %s %" PRIdPTR " -> %" PRIdPTR, tcp, reason, val, - val + 1); + VLOG(2).AtLocation(file, line) << "TCP ref " << tcp << " : " << reason + << " " << val << " -> " << val + 1; } gpr_ref(&tcp->refcount); } @@ -181,7 +177,7 @@ static void on_read(void* tcpp, grpc_error_handle error) { grpc_winsocket_callback_info* info = &socket->read_info; if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p on_read", tcp); + LOG(INFO) << "TCP:" << tcp << " on_read"; } if (error.ok()) { @@ -213,7 +209,7 @@ static void on_read(void* tcpp, grpc_error_handle error) { } } else { if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p unref read_slice", tcp); + LOG(INFO) << "TCP:" << tcp << " unref read_slice"; } grpc_slice_buffer_reset_and_unref(tcp->read_slices); error = grpc_error_set_int( @@ -244,7 +240,7 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, size_t i; if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p win_read", tcp); + LOG(INFO) << "TCP:" << tcp << " win_read"; } if (tcp->shutting_down) { @@ -315,7 +311,7 @@ static void on_write(void* tcpp, grpc_error_handle error) { grpc_closure* cb; if (GRPC_TRACE_FLAG_ENABLED(tcp)) { - gpr_log(GPR_INFO, "TCP:%p on_write", tcp); + LOG(INFO) << "TCP:" << tcp << " on_write"; } gpr_mu_lock(&tcp->mu); diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 9181383081..f931658c67 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -21,12 +21,12 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include #include -#include #include #include @@ -335,10 +335,10 @@ static void timer_init(grpc_timer* timer, grpc_core::Timestamp deadline, #endif if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TIMER %p: SET %" PRId64 " now %" PRId64 " call %p[%p]", - timer, deadline.milliseconds_after_process_epoch(), - grpc_core::Timestamp::Now().milliseconds_after_process_epoch(), - closure, closure->cb); + VLOG(2) << "TIMER " << timer << ": SET " + << deadline.milliseconds_after_process_epoch() << " now " + << grpc_core::Timestamp::Now().milliseconds_after_process_epoch() + << " call " << closure << "[" << closure->cb << "]"; } if (!g_shared_mutables.initialized) { @@ -371,12 +371,10 @@ static void timer_init(grpc_timer* timer, grpc_core::Timestamp deadline, list_join(&shard->list, timer); } if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, - " .. add to shard %d with queue_deadline_cap=%" PRId64 - " => is_first_timer=%s", - static_cast(shard - g_shards), - shard->queue_deadline_cap.milliseconds_after_process_epoch(), - is_first_timer ? "true" : "false"); + VLOG(2) << " .. add to shard " << (shard - g_shards) + << " with queue_deadline_cap=" + << shard->queue_deadline_cap.milliseconds_after_process_epoch() + << " => is_first_timer=" << (is_first_timer ? "true" : "false"); } gpr_mu_unlock(&shard->mu); @@ -394,8 +392,8 @@ static void timer_init(grpc_timer* timer, grpc_core::Timestamp deadline, if (is_first_timer) { gpr_mu_lock(&g_shared_mutables.mu); if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, " .. old shard min_deadline=%" PRId64, - shard->min_deadline.milliseconds_after_process_epoch()); + VLOG(2) << " .. old shard min_deadline=" + << shard->min_deadline.milliseconds_after_process_epoch(); } if (deadline < shard->min_deadline) { grpc_core::Timestamp old_min_deadline = g_shard_queue[0]->min_deadline; @@ -436,8 +434,8 @@ static void timer_cancel(grpc_timer* timer) { timer_shard* shard = &g_shards[grpc_core::HashPointer(timer, g_num_shards)]; gpr_mu_lock(&shard->mu); if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TIMER %p: CANCEL pending=%s", timer, - timer->pending ? "true" : "false"); + VLOG(2) << "TIMER " << timer + << ": CANCEL pending=" << (timer->pending ? "true" : "false"); } if (timer->pending) { @@ -477,9 +475,9 @@ static bool refill_heap(timer_shard* shard, grpc_core::Timestamp now) { grpc_core::Duration::FromSecondsAsDouble(deadline_delta); if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, " .. shard[%d]->queue_deadline_cap --> %" PRId64, - static_cast(shard - g_shards), - shard->queue_deadline_cap.milliseconds_after_process_epoch()); + VLOG(2) << " .. shard[" << (shard - g_shards) + << "]->queue_deadline_cap --> " + << shard->queue_deadline_cap.milliseconds_after_process_epoch(); } for (timer = shard->list.next; timer != &shard->list; timer = next) { next = timer->next; @@ -489,8 +487,9 @@ static bool refill_heap(timer_shard* shard, grpc_core::Timestamp now) { if (timer_deadline < shard->queue_deadline_cap) { if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, " .. add timer with deadline %" PRId64 " to heap", - timer_deadline.milliseconds_after_process_epoch()); + VLOG(2) << " .. add timer with deadline " + << timer_deadline.milliseconds_after_process_epoch() + << " to heap"; } list_remove(timer); grpc_timer_heap_add(&shard->heap, timer); @@ -506,9 +505,8 @@ static grpc_timer* pop_one(timer_shard* shard, grpc_core::Timestamp now) { grpc_timer* timer; for (;;) { if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, " .. shard[%d]: heap_empty=%s", - static_cast(shard - g_shards), - grpc_timer_heap_is_empty(&shard->heap) ? "true" : "false"); + VLOG(2) << " .. shard[" << (shard - g_shards) << "]: heap_empty=" + << (grpc_timer_heap_is_empty(&shard->heap) ? "true" : "false"); } if (grpc_timer_heap_is_empty(&shard->heap)) { if (now < shard->queue_deadline_cap) return nullptr; @@ -519,15 +517,14 @@ static grpc_timer* pop_one(timer_shard* shard, grpc_core::Timestamp now) { grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch( timer->deadline); if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, - " .. check top timer deadline=%" PRId64 " now=%" PRId64, - timer_deadline.milliseconds_after_process_epoch(), - now.milliseconds_after_process_epoch()); + VLOG(2) << " .. check top timer deadline=" + << timer_deadline.milliseconds_after_process_epoch() + << " now=" << now.milliseconds_after_process_epoch(); } if (timer_deadline > now) return nullptr; if (GRPC_TRACE_FLAG_ENABLED(timer)) { - gpr_log(GPR_DEBUG, "TIMER %p: FIRE %" PRId64 "ms late", timer, - (now - timer_deadline).millis()); + VLOG(2) << "TIMER " << timer << ": FIRE " + << (now - timer_deadline).millis() << "ms late"; } timer->pending = false; grpc_timer_heap_pop(&shard->heap); @@ -550,8 +547,7 @@ static size_t pop_timers(timer_shard* shard, grpc_core::Timestamp now, *new_min_deadline = compute_min_deadline(shard); gpr_mu_unlock(&shard->mu); if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, " .. shard[%d] popped %" PRIdPTR, - static_cast(shard - g_shards), n); + VLOG(2) << " .. shard[" << (shard - g_shards) << "] popped " << n; } return n; } @@ -589,10 +585,10 @@ static grpc_timer_check_result run_some_expired_timers( result = GRPC_TIMERS_CHECKED_AND_EMPTY; if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log( - GPR_DEBUG, " .. shard[%d]->min_deadline = %" PRId64, - static_cast(g_shard_queue[0] - g_shards), - g_shard_queue[0]->min_deadline.milliseconds_after_process_epoch()); + VLOG(2) + << " .. shard[" << (g_shard_queue[0] - g_shards) + << "]->min_deadline = " + << g_shard_queue[0]->min_deadline.milliseconds_after_process_epoch(); } while (g_shard_queue[0]->min_deadline < now || @@ -608,15 +604,12 @@ static grpc_timer_check_result run_some_expired_timers( } if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log( - GPR_DEBUG, - " .. result --> %d" - ", shard[%d]->min_deadline %" PRId64 " --> %" PRId64 - ", now=%" PRId64, - result, static_cast(g_shard_queue[0] - g_shards), - g_shard_queue[0]->min_deadline.milliseconds_after_process_epoch(), - new_min_deadline.milliseconds_after_process_epoch(), - now.milliseconds_after_process_epoch()); + VLOG(2) + << " .. result --> " << result << ", shard[" + << (g_shard_queue[0] - g_shards) << "]->min_deadline " + << g_shard_queue[0]->min_deadline.milliseconds_after_process_epoch() + << " --> " << new_min_deadline.milliseconds_after_process_epoch() + << ", now=" << now.milliseconds_after_process_epoch(); } // An grpc_timer_init() on the shard could intervene here, adding a new @@ -668,9 +661,9 @@ static grpc_timer_check_result timer_check(grpc_core::Timestamp* next) { *next = std::min(*next, min_timer); } if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_DEBUG, "TIMER CHECK SKIP: now=%" PRId64 " min_timer=%" PRId64, - now.milliseconds_after_process_epoch(), - min_timer.milliseconds_after_process_epoch()); + VLOG(2) << "TIMER CHECK SKIP: now=" + << now.milliseconds_after_process_epoch() + << " min_timer=" << min_timer.milliseconds_after_process_epoch(); } return GRPC_TIMERS_CHECKED_AND_EMPTY; } @@ -689,20 +682,18 @@ static grpc_timer_check_result timer_check(grpc_core::Timestamp* next) { next_str = absl::StrCat(next->milliseconds_after_process_epoch()); } #if GPR_ARCH_64 - gpr_log( - GPR_DEBUG, - "TIMER CHECK BEGIN: now=%" PRId64 " next=%s tls_min=%" PRId64 - " glob_min=%" PRId64, - now.milliseconds_after_process_epoch(), next_str.c_str(), - min_timer.milliseconds_after_process_epoch(), - grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch( - gpr_atm_no_barrier_load((gpr_atm*)(&g_shared_mutables.min_timer))) - .milliseconds_after_process_epoch()); + VLOG(2) << "TIMER CHECK BEGIN: now=" + << now.milliseconds_after_process_epoch() << " next=" << next_str + << " tls_min=" << min_timer.milliseconds_after_process_epoch() + << " glob_min=" + << grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch( + gpr_atm_no_barrier_load( + (gpr_atm*)(&g_shared_mutables.min_timer))) + .milliseconds_after_process_epoch(); #else - gpr_log(GPR_DEBUG, - "TIMER CHECK BEGIN: now=%" PRId64 " next=%s min=%" PRId64, - now.milliseconds_after_process_epoch(), next_str.c_str(), - min_timer.milliseconds_after_process_epoch()); + VLOG(2) << "TIMER CHECK BEGIN: now=" + << now.milliseconds_after_process_epoch() << " next=" << next_str + << " min=" << min_timer.milliseconds_after_process_epoch(); #endif } // actual code @@ -716,7 +707,7 @@ static grpc_timer_check_result timer_check(grpc_core::Timestamp* next) { } else { next_str = absl::StrCat(next->milliseconds_after_process_epoch()); } - gpr_log(GPR_DEBUG, "TIMER CHECK END: r=%d; next=%s", r, next_str.c_str()); + VLOG(2) << "TIMER CHECK END: r=" << r << "; next=" << next_str.c_str(); } return r; } diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 3e865b6ae0..5136ad35d1 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -24,7 +24,6 @@ #include "absl/log/log.h" #include -#include #include #include "src/core/lib/debug/trace.h" @@ -182,8 +181,7 @@ static bool wait_until(grpc_core::Timestamp next) { if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { grpc_core::Duration wait_time = next - grpc_core::Timestamp::Now(); - gpr_log(GPR_INFO, "sleep for a %" PRId64 " milliseconds", - wait_time.millis()); + LOG(INFO) << "sleep for a " << wait_time.millis() << " milliseconds"; } } else { // g_timed_waiter == true && next >= g_timed_waiter_deadline next = grpc_core::Timestamp::InfFuture(); @@ -198,9 +196,9 @@ static bool wait_until(grpc_core::Timestamp next) { gpr_cv_wait(&g_cv_wait, &g_mu, next.as_timespec(GPR_CLOCK_MONOTONIC)); if (GRPC_TRACE_FLAG_ENABLED(timer_check)) { - gpr_log(GPR_INFO, "wait ended: was_timed:%d kicked:%d", - my_timed_waiter_generation == g_timed_waiter_generation, - g_kicked); + LOG(INFO) << "wait ended: was_timed:" + << (my_timed_waiter_generation == g_timed_waiter_generation) + << " kicked:" << g_kicked; } // if this was the timed waiter, then we need to check timers, and flag // that there's now no timed waiter... we'll look for a replacement if diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index 715de5317f..715a28c047 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -32,8 +32,9 @@ #include #include -#include "src/core/lib/event_engine/event_engine_context.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/construct_destruct.h" +#include "src/core/lib/gprpp/dump_args.h" #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/sync.h" @@ -41,6 +42,7 @@ #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/detail/status.h" #include "src/core/lib/promise/poll.h" +#include "src/core/util/latent_see.h" namespace grpc_core { @@ -544,6 +546,8 @@ class PromiseActivity final } void WakeupAsync(WakeupMask) final { + GRPC_LATENT_SEE_INNER_SCOPE("PromiseActivity::WakeupAsync"); + wakeup_flow_.Begin(GRPC_LATENT_SEE_METADATA("Activity::Wakeup")); if (!wakeup_scheduled_.exchange(true, std::memory_order_acq_rel)) { // Can't safely run, so ask to run later. this->ScheduleWakeup(); @@ -567,6 +571,8 @@ class PromiseActivity final // In response to Wakeup, run the Promise state machine again until it // settles. Then check for completion, and if we have completed, call on_done. void Step() ABSL_LOCKS_EXCLUDED(mu()) { + GRPC_LATENT_SEE_PARENT_SCOPE("PromiseActivity::Step"); + wakeup_flow_.End(); // Poll the promise until things settle out under a lock. mu()->Lock(); if (done_) { @@ -643,6 +649,7 @@ class PromiseActivity final GPR_NO_UNIQUE_ADDRESS Promise promise; }; GPR_NO_UNIQUE_ADDRESS PromiseHolder promise_holder_ ABSL_GUARDED_BY(mu()); + GPR_NO_UNIQUE_ADDRESS latent_see::Flow wakeup_flow_; }; } // namespace promise_detail @@ -662,7 +669,11 @@ ActivityPtr MakeActivity(Factory promise_factory, } inline Pending IntraActivityWaiter::pending() { - wakeups_ |= GetContext()->CurrentParticipant(); + const auto new_wakeups = GetContext()->CurrentParticipant(); + GRPC_TRACE_LOG(promise_primitives, INFO) + << "IntraActivityWaiter::pending: " + << GRPC_DUMP_ARGS(this, new_wakeups, wakeups_); + wakeups_ |= new_wakeups; return Pending(); } diff --git a/src/core/lib/promise/all_ok.h b/src/core/lib/promise/all_ok.h index 1f15631ac2..63abaf754d 100644 --- a/src/core/lib/promise/all_ok.h +++ b/src/core/lib/promise/all_ok.h @@ -39,17 +39,21 @@ struct AllOkTraits { template using ResultType = Result; template - static bool IsOk(const T& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(const T& x) { return IsStatusOk(x); } - static Empty Unwrapped(StatusFlag) { return Empty{}; } - static Empty Unwrapped(absl::Status) { return Empty{}; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Empty Unwrapped(StatusFlag) { + return Empty{}; + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Empty Unwrapped(absl::Status) { + return Empty{}; + } template - static R EarlyReturn(T&& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn(T&& x) { return StatusCast(std::forward(x)); } template - static Result FinalReturn(A&&...) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Result FinalReturn(A&&...) { return Result{}; } }; @@ -58,8 +62,11 @@ struct AllOkTraits { template class AllOk { public: - explicit AllOk(Promises... promises) : state_(std::move(promises)...) {} - auto operator()() { return state_.PollOnce(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit AllOk(Promises... promises) + : state_(std::move(promises)...) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()() { + return state_.PollOnce(); + } private: JoinState, Promises...> state_; @@ -71,7 +78,7 @@ class AllOk { // If any fail, cancel the rest and return the failure. // If all succeed, return Ok. template -auto AllOk(Promises... promises) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto AllOk(Promises... promises) { return promise_detail::AllOk(std::move(promises)...); } diff --git a/src/core/lib/promise/cancel_callback.h b/src/core/lib/promise/cancel_callback.h index b02b2a45ff..ed999c293f 100644 --- a/src/core/lib/promise/cancel_callback.h +++ b/src/core/lib/promise/cancel_callback.h @@ -28,26 +28,28 @@ namespace cancel_callback_detail { template class Handler { public: - explicit Handler(Fn fn) : fn_(std::move(fn)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Handler(Fn fn) + : fn_(std::move(fn)) {} Handler(const Handler&) = delete; Handler& operator=(const Handler&) = delete; - ~Handler() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~Handler() { if (!done_) { promise_detail::Context ctx(arena_.get()); fn_(); } } - Handler(Handler&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Handler(Handler&& other) noexcept : fn_(std::move(other.fn_)), done_(other.done_) { other.done_ = true; } - Handler& operator=(Handler&& other) noexcept { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Handler& operator=( + Handler&& other) noexcept { fn_ = std::move(other.fn_); done_ = other.done_; other.done_ = true; } - void Done() { done_ = true; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void Done() { done_ = true; } private: Fn fn_; @@ -67,7 +69,8 @@ class Handler { // completion. // Returns a promise with the same result type as main_fn. template -auto OnCancel(MainFn main_fn, CancelFn cancel_fn) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto OnCancel(MainFn main_fn, + CancelFn cancel_fn) { return [on_cancel = cancel_callback_detail::Handler(std::move(cancel_fn)), main_fn = promise_detail::PromiseLike( @@ -84,7 +87,8 @@ auto OnCancel(MainFn main_fn, CancelFn cancel_fn) { // resulting promise. If the factory is dropped without being called, cancel_fn // is called. template -auto OnCancelFactory(MainFn main_fn, CancelFn cancel_fn) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto OnCancelFactory(MainFn main_fn, + CancelFn cancel_fn) { return [on_cancel = cancel_callback_detail::Handler(std::move(cancel_fn)), main_fn = std::move(main_fn)]() mutable { diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h index e1f1f6511d..a2597e324a 100644 --- a/src/core/lib/promise/context.h +++ b/src/core/lib/promise/context.h @@ -62,7 +62,7 @@ class ThreadLocalContext : public ContextType { ThreadLocalContext(const ThreadLocalContext&) = delete; ThreadLocalContext& operator=(const ThreadLocalContext&) = delete; - static T* get() { return current_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T* get() { return current_; } private: T* const old_; @@ -83,7 +83,7 @@ class Context::Base>> : public Context::Base> { public: using Context::Base>::Context; - static T* get() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T* get() { return DownCast(Context::Base>::get()); } }; @@ -107,26 +107,26 @@ class WithContext { // Return true if a context of type T is currently active. template -bool HasContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool HasContext() { return promise_detail::Context::get() != nullptr; } // Retrieve the current value of a context, or abort if the value is unset. template -T* GetContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* GetContext() { auto* p = promise_detail::Context::get(); - CHECK_NE(p, nullptr); + DCHECK_NE(p, nullptr); return p; } // Retrieve the current value of a context, or nullptr if the value is unset. template -T* MaybeGetContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* MaybeGetContext() { return promise_detail::Context::get(); } template -void SetContext(T* p) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void SetContext(T* p) { promise_detail::Context::set(p); } diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h index 5f0effcb65..d6ce8782bf 100644 --- a/src/core/lib/promise/detail/join_state.h +++ b/src/core/lib/promise/detail/join_state.h @@ -15,7 +15,7 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_JOIN_STATE_H #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_JOIN_STATE_H -// This file is generated by tools/codegen/core/gen_seq.py +// This file is generated by tools/codegen/core/gen_join.py #include #include @@ -54,30 +54,23 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result1 result1; }; GPR_NO_UNIQUE_ADDRESS BitSet<2> ready; - JoinState(P0&& p0, P1&& p1) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -91,17 +84,16 @@ struct JoinState { } using Result = typename Traits::template ResultType>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/2"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/2 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/2 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -112,18 +104,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/2 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/2 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/2"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/2 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/2 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -134,7 +126,8 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/2 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/2 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1)); @@ -166,37 +159,26 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result2 result2; }; GPR_NO_UNIQUE_ADDRESS BitSet<3> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -215,17 +197,16 @@ struct JoinState { } using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/3"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/3 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/3 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -236,18 +217,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/3 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/3 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/3"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/3 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/3 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -258,18 +239,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/3 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/3 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/3"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/3 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/3 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -280,7 +261,8 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/3 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/3 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -319,14 +301,15 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result3 result3; }; GPR_NO_UNIQUE_ADDRESS BitSet<4> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); Construct(&promise3, std::forward(p3)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -334,29 +317,14 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -380,17 +348,16 @@ struct JoinState { } using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/4"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/4 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/4 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -401,18 +368,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/4 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/4 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/4"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/4 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/4 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -423,18 +390,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/4 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/4 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/4"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/4 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/4 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -445,18 +412,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/4 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/4 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/4"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/4 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/4 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -467,7 +434,8 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/4 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/4 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -513,15 +481,16 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result4 result4; }; GPR_NO_UNIQUE_ADDRESS BitSet<5> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); Construct(&promise3, std::forward(p3)); Construct(&promise4, std::forward(p4)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -530,34 +499,15 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -586,17 +536,16 @@ struct JoinState { } using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/5"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -607,18 +556,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/5 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/5 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/5"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -629,18 +578,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/5 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/5 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/5"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -651,18 +600,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/5 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/5 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/5"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -673,18 +622,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/5 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/5 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/5"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/5 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/5 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -695,7 +644,8 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/5 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/5 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -748,7 +698,8 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result5 result5; }; GPR_NO_UNIQUE_ADDRESS BitSet<6> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4, P5&& p5) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); @@ -756,8 +707,8 @@ struct JoinState { Construct(&promise4, std::forward(p4)); Construct(&promise5, std::forward(p5)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -767,39 +718,16 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } - if (ready.is_set(5)) { - Construct(&result5, std::move(other.result5)); - } else { - Construct(&promise5, std::move(other.promise5)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); + Construct(&promise5, std::move(other.promise5)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -833,17 +761,16 @@ struct JoinState { } using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/6"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -854,18 +781,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/6 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/6 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/6"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -876,18 +803,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/6 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/6 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/6"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -898,18 +825,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/6 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/6 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/6"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -920,18 +847,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/6 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/6 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/6"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -942,18 +869,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/6 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/6 already ready"; } if (!ready.is_set(5)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 6/6"; auto poll = promise5(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 6/6 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 6/6 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(5); @@ -964,7 +891,8 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 6/6 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 6/6 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -1023,7 +951,9 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result6 result6; }; GPR_NO_UNIQUE_ADDRESS BitSet<7> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4, P5&& p5, + P6&& p6) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); @@ -1032,8 +962,8 @@ struct JoinState { Construct(&promise5, std::forward(p5)); Construct(&promise6, std::forward(p6)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -1044,44 +974,17 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } - if (ready.is_set(5)) { - Construct(&result5, std::move(other.result5)); - } else { - Construct(&promise5, std::move(other.promise5)); - } - if (ready.is_set(6)) { - Construct(&result6, std::move(other.result6)); - } else { - Construct(&promise6, std::move(other.promise6)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); + Construct(&promise5, std::move(other.promise5)); + Construct(&promise6, std::move(other.promise6)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -1120,17 +1023,16 @@ struct JoinState { } using Result = typename Traits::template ResultType>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/7"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -1141,18 +1043,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/7 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/7 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/7"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -1163,18 +1065,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/7 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/7 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/7"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -1185,18 +1087,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/7 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/7 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/7"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -1207,18 +1109,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/7 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/7 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/7"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -1229,18 +1131,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/7 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/7 already ready"; } if (!ready.is_set(5)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 6/7"; auto poll = promise5(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 6/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 6/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(5); @@ -1251,18 +1153,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 6/7 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 6/7 already ready"; } if (!ready.is_set(6)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 7/7"; auto poll = promise6(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 7/7 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 7/7 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(6); @@ -1273,7 +1175,8 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 7/7 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 7/7 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -1339,8 +1242,9 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result7 result7; }; GPR_NO_UNIQUE_ADDRESS BitSet<8> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6, - P7&& p7) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4, P5&& p5, + P6&& p6, P7&& p7) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); @@ -1350,8 +1254,8 @@ struct JoinState { Construct(&promise6, std::forward(p6)); Construct(&promise7, std::forward(p7)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -1363,49 +1267,18 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } - if (ready.is_set(5)) { - Construct(&result5, std::move(other.result5)); - } else { - Construct(&promise5, std::move(other.promise5)); - } - if (ready.is_set(6)) { - Construct(&result6, std::move(other.result6)); - } else { - Construct(&promise6, std::move(other.promise6)); - } - if (ready.is_set(7)) { - Construct(&result7, std::move(other.result7)); - } else { - Construct(&promise7, std::move(other.promise7)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); + Construct(&promise5, std::move(other.promise5)); + Construct(&promise6, std::move(other.promise6)); + Construct(&promise7, std::move(other.promise7)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -1449,17 +1322,16 @@ struct JoinState { } using Result = typename Traits::template ResultType>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/8"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -1470,18 +1342,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/8 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/8 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/8"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -1492,18 +1364,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/8 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/8 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/8"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -1514,18 +1386,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/8 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/8 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/8"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -1536,18 +1408,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/8 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/8 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/8"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -1558,18 +1430,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/8 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/8 already ready"; } if (!ready.is_set(5)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 6/8"; auto poll = promise5(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 6/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 6/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(5); @@ -1580,18 +1452,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 6/8 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 6/8 already ready"; } if (!ready.is_set(6)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 7/8"; auto poll = promise6(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 7/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 7/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(6); @@ -1602,18 +1474,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 7/8 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 7/8 already ready"; } if (!ready.is_set(7)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 8/8"; auto poll = promise7(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 8/8 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 8/8 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(7); @@ -1624,7 +1496,8 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 8/8 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 8/8 already ready"; } if (ready.all()) { return Traits::FinalReturn(std::move(result0), std::move(result1), @@ -1696,8 +1569,9 @@ struct JoinState { GPR_NO_UNIQUE_ADDRESS Result8 result8; }; GPR_NO_UNIQUE_ADDRESS BitSet<9> ready; - JoinState(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6, - P7&& p7, P8&& p8) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(P0&& p0, P1&& p1, P2&& p2, + P3&& p3, P4&& p4, P5&& p5, + P6&& p6, P7&& p7, P8&& p8) { Construct(&promise0, std::forward(p0)); Construct(&promise1, std::forward(p1)); Construct(&promise2, std::forward(p2)); @@ -1708,8 +1582,8 @@ struct JoinState { Construct(&promise7, std::forward(p7)); Construct(&promise8, std::forward(p8)); } - JoinState(const JoinState& other) { - CHECK(other.ready.none()); + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(const JoinState& other) { + DCHECK(other.ready.none()); Construct(&promise0, other.promise0); Construct(&promise1, other.promise1); Construct(&promise2, other.promise2); @@ -1722,54 +1596,19 @@ struct JoinState { } JoinState& operator=(const JoinState& other) = delete; JoinState& operator=(JoinState&& other) = delete; - JoinState(JoinState&& other) noexcept : ready(other.ready) { - if (ready.is_set(0)) { - Construct(&result0, std::move(other.result0)); - } else { - Construct(&promise0, std::move(other.promise0)); - } - if (ready.is_set(1)) { - Construct(&result1, std::move(other.result1)); - } else { - Construct(&promise1, std::move(other.promise1)); - } - if (ready.is_set(2)) { - Construct(&result2, std::move(other.result2)); - } else { - Construct(&promise2, std::move(other.promise2)); - } - if (ready.is_set(3)) { - Construct(&result3, std::move(other.result3)); - } else { - Construct(&promise3, std::move(other.promise3)); - } - if (ready.is_set(4)) { - Construct(&result4, std::move(other.result4)); - } else { - Construct(&promise4, std::move(other.promise4)); - } - if (ready.is_set(5)) { - Construct(&result5, std::move(other.result5)); - } else { - Construct(&promise5, std::move(other.promise5)); - } - if (ready.is_set(6)) { - Construct(&result6, std::move(other.result6)); - } else { - Construct(&promise6, std::move(other.promise6)); - } - if (ready.is_set(7)) { - Construct(&result7, std::move(other.result7)); - } else { - Construct(&promise7, std::move(other.promise7)); - } - if (ready.is_set(8)) { - Construct(&result8, std::move(other.result8)); - } else { - Construct(&promise8, std::move(other.promise8)); - } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION JoinState(JoinState&& other) noexcept { + DCHECK(other.ready.none()); + Construct(&promise0, std::move(other.promise0)); + Construct(&promise1, std::move(other.promise1)); + Construct(&promise2, std::move(other.promise2)); + Construct(&promise3, std::move(other.promise3)); + Construct(&promise4, std::move(other.promise4)); + Construct(&promise5, std::move(other.promise5)); + Construct(&promise6, std::move(other.promise6)); + Construct(&promise7, std::move(other.promise7)); + Construct(&promise8, std::move(other.promise8)); } - ~JoinState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~JoinState() { if (ready.is_set(0)) { Destruct(&result0); } else { @@ -1819,17 +1658,16 @@ struct JoinState { using Result = typename Traits::template ResultType< std::tuple>; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { if (!ready.is_set(0)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 1/9"; auto poll = promise0(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 1/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 1/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(0); @@ -1840,18 +1678,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 1/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 1/9 already ready"; } if (!ready.is_set(1)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 2/9"; auto poll = promise1(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 2/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 2/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(1); @@ -1862,18 +1700,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 2/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 2/9 already ready"; } if (!ready.is_set(2)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 3/9"; auto poll = promise2(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 3/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 3/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(2); @@ -1884,18 +1722,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 3/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 3/9 already ready"; } if (!ready.is_set(3)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 4/9"; auto poll = promise3(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 4/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 4/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(3); @@ -1906,18 +1744,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 4/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 4/9 already ready"; } if (!ready.is_set(4)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 5/9"; auto poll = promise4(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 5/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 5/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(4); @@ -1928,18 +1766,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 5/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 5/9 already ready"; } if (!ready.is_set(5)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 6/9"; auto poll = promise5(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 6/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 6/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(5); @@ -1950,18 +1788,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 6/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 6/9 already ready"; } if (!ready.is_set(6)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 7/9"; auto poll = promise6(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 7/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 7/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(6); @@ -1972,18 +1810,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 7/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 7/9 already ready"; } if (!ready.is_set(7)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 8/9"; auto poll = promise7(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 8/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 8/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(7); @@ -1994,18 +1832,18 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 8/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 8/9 already ready"; } if (!ready.is_set(8)) { GRPC_TRACE_VLOG(promise_primitives, 2) << "join[" << this << "]: begin poll joint 9/9"; auto poll = promise8(); - if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - auto* p = poll.value_if_ready(); - VLOG(2) << "join[" << this << "]: joint 9/9 " - << (p != nullptr ? (Traits::IsOk(*p) ? "ready" : "early-error") - : "pending"); - } + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: end poll joint 9/9 " + << (poll.pending() + ? "pending" + : (Traits::IsOk(poll.value()) ? "ready" : "early-error")); if (auto* p = poll.value_if_ready()) { if (Traits::IsOk(*p)) { ready.set(8); @@ -2016,7 +1854,8 @@ struct JoinState { } } } else if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - VLOG(2) << "join[" << this << "]: joint 9/9 already ready"; + GRPC_TRACE_VLOG(promise_primitives, 2) + << "join[" << this << "]: joint 9/9 already ready"; } if (ready.all()) { return Traits::FinalReturn( diff --git a/src/core/lib/promise/detail/promise_factory.h b/src/core/lib/promise/detail/promise_factory.h index 7e38411b8b..1e50774392 100644 --- a/src/core/lib/promise/detail/promise_factory.h +++ b/src/core/lib/promise/detail/promise_factory.h @@ -115,41 +115,44 @@ class Curried { // Promote a callable(A) -> T | Poll to a PromiseFactory(A) -> Promise by // capturing A. template -absl::enable_if_t>::value, - PromiseLike, A>>> -PromiseFactoryImpl(F&& f, A&& arg) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + absl::enable_if_t>::value, + PromiseLike, A>>> + PromiseFactoryImpl(F&& f, A&& arg) { return Curried, A>(std::forward(f), std::forward(arg)); } // Promote a callable() -> T|Poll to a PromiseFactory(A) -> Promise // by dropping the argument passed to the factory. template -absl::enable_if_t>::value, - PromiseLike>> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::enable_if_t< + !IsVoidCallable>::value, PromiseLike>> PromiseFactoryImpl(F f, A&&) { return PromiseLike(std::move(f)); } // Promote a callable() -> T|Poll to a PromiseFactory() -> Promise template -absl::enable_if_t>::value, - PromiseLike>> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::enable_if_t< + !IsVoidCallable>::value, PromiseLike>> PromiseFactoryImpl(F f) { return PromiseLike(std::move(f)); } // Given a callable(A) -> Promise, name it a PromiseFactory and use it. template -absl::enable_if_t>::value, - PromiseLike()(std::declval()))>> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::enable_if_t< + IsVoidCallable>::value, + PromiseLike()(std::declval()))>> PromiseFactoryImpl(F&& f, A&& arg) { return f(std::forward(arg)); } // Given a callable(A) -> Promise, name it a PromiseFactory and use it. template -absl::enable_if_t>::value, - PromiseLike()(std::declval()))>> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::enable_if_t< + IsVoidCallable>::value, + PromiseLike()(std::declval()))>> PromiseFactoryImpl(F& f, A&& arg) { return f(std::forward(arg)); } @@ -157,17 +160,19 @@ PromiseFactoryImpl(F& f, A&& arg) { // Given a callable() -> Promise, promote it to a // PromiseFactory(A) -> Promise by dropping the first argument. template -absl::enable_if_t>::value, - PromiseLike()())>> -PromiseFactoryImpl(F&& f, A&&) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + absl::enable_if_t>::value, + PromiseLike()())>> + PromiseFactoryImpl(F&& f, A&&) { return f(); } // Given a callable() -> Promise, name it a PromiseFactory and use it. template -absl::enable_if_t>::value, - PromiseLike()())>> -PromiseFactoryImpl(F&& f) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + absl::enable_if_t>::value, + PromiseLike()())>> + PromiseFactoryImpl(F&& f) { return f(); } @@ -181,9 +186,10 @@ class OncePromiseFactory { using Promise = decltype(PromiseFactoryImpl(std::move(f_), std::declval())); - explicit OncePromiseFactory(F f) : f_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit OncePromiseFactory(F f) + : f_(std::move(f)) {} - Promise Make(Arg&& a) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make(Arg&& a) { return PromiseFactoryImpl(std::move(f_), std::forward(a)); } }; @@ -197,9 +203,12 @@ class OncePromiseFactory { using Arg = void; using Promise = decltype(PromiseFactoryImpl(std::move(f_))); - explicit OncePromiseFactory(F f) : f_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit OncePromiseFactory(F f) + : f_(std::move(f)) {} - Promise Make() { return PromiseFactoryImpl(std::move(f_)); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make() { + return PromiseFactoryImpl(std::move(f_)); + } }; template @@ -211,12 +220,15 @@ class RepeatedPromiseFactory { using Arg = A; using Promise = decltype(PromiseFactoryImpl(f_, std::declval())); - explicit RepeatedPromiseFactory(F f) : f_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit RepeatedPromiseFactory(F f) + : f_(std::move(f)) {} - Promise Make(Arg&& a) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make(Arg&& a) const { + return PromiseFactoryImpl(f_, std::forward(a)); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make(Arg&& a) { return PromiseFactoryImpl(f_, std::forward(a)); } - Promise Make(Arg&& a) { return PromiseFactoryImpl(f_, std::forward(a)); } }; template @@ -228,10 +240,15 @@ class RepeatedPromiseFactory { using Arg = void; using Promise = decltype(PromiseFactoryImpl(f_)); - explicit RepeatedPromiseFactory(F f) : f_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit RepeatedPromiseFactory(F f) + : f_(std::move(f)) {} - Promise Make() const { return PromiseFactoryImpl(f_); } - Promise Make() { return PromiseFactoryImpl(f_); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make() const { + return PromiseFactoryImpl(f_); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make() { + return PromiseFactoryImpl(f_); + } }; } // namespace promise_detail diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h index 8be6165754..60a7fcc26b 100644 --- a/src/core/lib/promise/detail/promise_like.h +++ b/src/core/lib/promise/detail/promise_like.h @@ -51,16 +51,21 @@ namespace promise_detail { template struct PollWrapper { - static Poll Wrap(T&& x) { return Poll(std::forward(x)); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Wrap(T&& x) { + return Poll(std::forward(x)); + } }; template struct PollWrapper> { - static Poll Wrap(Poll&& x) { return std::forward>(x); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Wrap(Poll&& x) { + return std::forward>(x); + } }; template -auto WrapInPoll(T&& x) -> decltype(PollWrapper::Wrap(std::forward(x))) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto WrapInPoll(T&& x) + -> decltype(PollWrapper::Wrap(std::forward(x))) { return PollWrapper::Wrap(std::forward(x)); } @@ -88,8 +93,12 @@ class PromiseLike(f)) {} - auto operator()() -> decltype(WrapInPoll(f_())) { return WrapInPoll(f_()); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION PromiseLike(F&& f) + : f_(std::forward(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()() + -> decltype(WrapInPoll(f_())) { + return WrapInPoll(f_()); + } using Result = typename PollTraits::Type; }; diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h index d343e32a32..b2b635f98b 100644 --- a/src/core/lib/promise/detail/seq_state.h +++ b/src/core/lib/promise/detail/seq_state.h @@ -102,11 +102,13 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, DebugLocation whence) noexcept : whence(whence) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, + DebugLocation whence) noexcept + : whence(whence) { Construct(&prior.current_promise, std::forward

(p)); Construct(&prior.next_factory, std::forward(f0)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.current_promise); @@ -118,29 +120,22 @@ struct SeqState { tail0: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); + DCHECK(state == State::kState0); Construct(&prior.current_promise, other.prior.current_promise); Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.current_promise, std::move(other.prior.current_promise)); Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -230,13 +225,14 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.current_promise, std::forward

(p)); Construct(&prior.prior.next_factory, std::forward(f0)); Construct(&prior.next_factory, std::forward(f1)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.current_promise); @@ -253,37 +249,26 @@ struct SeqState { tail1: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.current_promise, other.prior.prior.current_promise); Construct(&prior.prior.next_factory, other.prior.prior.next_factory); Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.current_promise, + std::move(other.prior.prior.current_promise)); Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail1: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -417,14 +402,16 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.current_promise, std::forward

(p)); Construct(&prior.prior.prior.next_factory, std::forward(f0)); Construct(&prior.prior.next_factory, std::forward(f1)); Construct(&prior.next_factory, std::forward(f2)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.current_promise); @@ -446,46 +433,31 @@ struct SeqState { tail2: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.current_promise, + other.prior.prior.prior.current_promise); Construct(&prior.prior.prior.next_factory, other.prior.prior.prior.next_factory); Construct(&prior.prior.next_factory, other.prior.prior.next_factory); Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.current_promise)); Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail2: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -663,8 +635,9 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.current_promise, std::forward

(p)); Construct(&prior.prior.prior.prior.next_factory, std::forward(f0)); @@ -672,7 +645,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f2)); Construct(&prior.next_factory, std::forward(f3)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.current_promise); @@ -699,10 +672,11 @@ struct SeqState { tail3: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.current_promise); Construct(&prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.next_factory); Construct(&prior.prior.prior.next_factory, @@ -711,43 +685,22 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.current_promise)); Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail3: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -976,8 +929,9 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.current_promise, std::forward

(p)); @@ -988,7 +942,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f3)); Construct(&prior.next_factory, std::forward(f4)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.current_promise); @@ -1020,10 +974,11 @@ struct SeqState { tail4: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.current_promise); Construct(&prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.next_factory); Construct(&prior.prior.prior.prior.next_factory, @@ -1034,51 +989,24 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.current_promise)); Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail3: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail4: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -1353,8 +1281,10 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.current_promise, std::forward

(p)); @@ -1367,7 +1297,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f4)); Construct(&prior.next_factory, std::forward(f5)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.current_promise); @@ -1404,10 +1334,11 @@ struct SeqState { tail5: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.prior.current_promise); Construct(&prior.prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.prior.next_factory); Construct(&prior.prior.prior.prior.prior.next_factory, @@ -1420,61 +1351,28 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.current_promise)); Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail3: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail4: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail5: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -1796,8 +1694,10 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, std::forward

(p)); @@ -1812,7 +1712,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f5)); Construct(&prior.next_factory, std::forward(f6)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise); @@ -1854,10 +1754,11 @@ struct SeqState { tail6: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.prior.prior.current_promise); Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.prior.prior.next_factory); Construct(&prior.prior.prior.prior.prior.prior.next_factory, @@ -1872,71 +1773,33 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail0; - case State::kState1: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.prior.current_promise, + std::move( + other.prior.prior.prior.prior.prior.prior.prior.current_promise)); Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail1: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail3: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail4: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail5: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail6: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -2306,8 +2169,10 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.prior.current_promise, std::forward

(p)); @@ -2324,7 +2189,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f6)); Construct(&prior.next_factory, std::forward(f7)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct( @@ -2372,10 +2237,12 @@ struct SeqState { tail7: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.current_promise); Construct( &prior.prior.prior.prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.next_factory); @@ -2393,81 +2260,35 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail1; - case State::kState2: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise)); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail1: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail2: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail3: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail4: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail5: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail6: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail7: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -2886,8 +2707,11 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, F8&& f8, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + F8&& f8, + DebugLocation whence) noexcept : whence(whence) { Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.current_promise, @@ -2908,7 +2732,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f7)); Construct(&prior.next_factory, std::forward(f8)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -2963,10 +2787,13 @@ struct SeqState { tail8: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.prior.prior.prior.current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise); Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -2988,92 +2815,40 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail2; - case State::kState3: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail8; - case State::kState9: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct( + &prior.prior.prior.prior.prior.prior.prior.prior.prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise)); Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail1: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail2: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail3: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail4: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail5: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail6: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail7: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail8: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -3543,8 +3318,11 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, F8&& f8, F9&& f9, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + F8&& f8, F9&& f9, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .current_promise, @@ -3568,7 +3346,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f8)); Construct(&prior.next_factory, std::forward(f9)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -3630,10 +3408,13 @@ struct SeqState { tail9: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -3659,103 +3440,44 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail3; - case State::kState4: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail4; - case State::kState5: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail8; - case State::kState9: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail9; - case State::kState10: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior + .prior.prior.current_promise)); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.next_factory)); - tail1: Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail2: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail3: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail4: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail5: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail6: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail7: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail8: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail9: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -4277,8 +3999,11 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, F8&& f8, F9&& f9, F10&& f10, DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + F8&& f8, F9&& f9, F10&& f10, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .current_promise, @@ -4305,7 +4030,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f9)); Construct(&prior.next_factory, std::forward(f10)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -4374,10 +4099,13 @@ struct SeqState { tail10: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .prior.current_promise); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -4407,114 +4135,48 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail3; - case State::kState4: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail4; - case State::kState5: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail5; - case State::kState6: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail8; - case State::kState9: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail9; - case State::kState10: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail10; - case State::kState11: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior + .prior.prior.prior.current_promise)); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.next_factory)); - tail2: Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail3: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail4: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail5: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail6: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail7: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail8: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail9: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail10: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { @@ -5089,9 +4751,12 @@ struct SeqState { GPR_NO_UNIQUE_ADDRESS State state = State::kState0; GPR_NO_UNIQUE_ADDRESS DebugLocation whence; - SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6, - F7&& f7, F8&& f8, F9&& f9, F10&& f10, F11&& f11, - DebugLocation whence) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(P&& p, F0&& f0, F1&& f1, + F2&& f2, F3&& f3, F4&& f4, + F5&& f5, F6&& f6, F7&& f7, + F8&& f8, F9&& f9, F10&& f10, + F11&& f11, + DebugLocation whence) noexcept : whence(whence) { Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.current_promise, @@ -5121,7 +4786,7 @@ struct SeqState { Construct(&prior.prior.next_factory, std::forward(f10)); Construct(&prior.next_factory, std::forward(f11)); } - ~SeqState() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~SeqState() { switch (state) { case State::kState0: Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -5197,10 +4862,13 @@ struct SeqState { tail11: Destruct(&prior.next_factory); } - SeqState(const SeqState& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(const SeqState& other) noexcept : state(other.state), whence(other.whence) { - CHECK(state == State::kState0); - Construct(&prior.current_promise, other.prior.current_promise); + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .prior.current_promise, + other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .prior.prior.current_promise); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.next_factory, other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior @@ -5234,126 +4902,52 @@ struct SeqState { Construct(&prior.next_factory, other.prior.next_factory); } SeqState& operator=(const SeqState& other) = delete; - SeqState(SeqState&& other) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState(SeqState&& other) noexcept : state(other.state), whence(other.whence) { - switch (state) { - case State::kState0: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.prior.current_promise)); - goto tail0; - case State::kState1: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.prior.current_promise)); - goto tail1; - case State::kState2: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.prior.current_promise)); - goto tail2; - case State::kState3: - Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .prior.prior.current_promise)); - goto tail3; - case State::kState4: - Construct( - &prior.prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail4; - case State::kState5: - Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.prior.prior - .current_promise)); - goto tail5; - case State::kState6: - Construct( - &prior.prior.prior.prior.prior.prior.current_promise, - std::move( - other.prior.prior.prior.prior.prior.prior.current_promise)); - goto tail6; - case State::kState7: - Construct( - &prior.prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.prior.current_promise)); - goto tail7; - case State::kState8: - Construct(&prior.prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.prior.current_promise)); - goto tail8; - case State::kState9: - Construct(&prior.prior.prior.current_promise, - std::move(other.prior.prior.prior.current_promise)); - goto tail9; - case State::kState10: - Construct(&prior.prior.current_promise, - std::move(other.prior.prior.current_promise)); - goto tail10; - case State::kState11: - Construct(&prior.current_promise, - std::move(other.prior.current_promise)); - goto tail11; - case State::kState12: - Construct(¤t_promise, std::move(other.current_promise)); - return; - } - tail0: + DCHECK(state == State::kState0); + Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior + .prior.current_promise, + std::move(other.prior.prior.prior.prior.prior.prior.prior.prior + .prior.prior.prior.prior.current_promise)); Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.prior.prior.next_factory)); - tail1: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.prior.next_factory)); - tail2: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .prior.prior.next_factory)); - tail3: Construct( &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail4: Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.prior.prior .next_factory)); - tail5: Construct( &prior.prior.prior.prior.prior.prior.prior.next_factory, std::move( other.prior.prior.prior.prior.prior.prior.prior.next_factory)); - tail6: Construct( &prior.prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.prior.next_factory)); - tail7: Construct(&prior.prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.prior.next_factory)); - tail8: Construct(&prior.prior.prior.prior.next_factory, std::move(other.prior.prior.prior.prior.next_factory)); - tail9: Construct(&prior.prior.prior.next_factory, std::move(other.prior.prior.prior.next_factory)); - tail10: Construct(&prior.prior.next_factory, std::move(other.prior.prior.next_factory)); - tail11: Construct(&prior.next_factory, std::move(other.prior.next_factory)); } - SeqState& operator=(SeqState&& other) = delete; - Poll PollOnce() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION SeqState& operator=(SeqState&& other) = + delete; + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollOnce() { switch (state) { case State::kState0: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { diff --git a/src/core/lib/promise/detail/status.h b/src/core/lib/promise/detail/status.h index f1c2aa03d8..42847c6ba6 100644 --- a/src/core/lib/promise/detail/status.h +++ b/src/core/lib/promise/detail/status.h @@ -30,12 +30,14 @@ namespace promise_detail { // Convert with a move the input status to an absl::Status. template -absl::Status IntoStatus(absl::StatusOr* status) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION absl::Status IntoStatus( + absl::StatusOr* status) { return std::move(status->status()); } // Convert with a move the input status to an absl::Status. -inline absl::Status IntoStatus(absl::Status* status) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline absl::Status IntoStatus( + absl::Status* status) { return std::move(*status); } @@ -44,10 +46,14 @@ inline absl::Status IntoStatus(absl::Status* status) { // Return true if the status represented by the argument is ok, false if not. // By implementing this function for other, non-absl::Status types, those types // can participate in TrySeq as result types that affect control flow. -inline bool IsStatusOk(const absl::Status& status) { return status.ok(); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk( + const absl::Status& status) { + return status.ok(); +} template -inline bool IsStatusOk(const absl::StatusOr& status) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk( + const absl::StatusOr& status) { return status.ok(); } @@ -56,29 +62,38 @@ struct StatusCastImpl; template struct StatusCastImpl { - static To Cast(To&& t) { return std::move(t); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static To Cast(To&& t) { + return std::move(t); + } }; template struct StatusCastImpl { - static To Cast(const To& t) { return t; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static To Cast(const To& t) { return t; } }; template struct StatusCastImpl> { - static absl::Status Cast(absl::StatusOr&& t) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + absl::StatusOr&& t) { return std::move(t.status()); } }; template struct StatusCastImpl&> { - static absl::Status Cast(const absl::StatusOr& t) { return t.status(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + const absl::StatusOr& t) { + return t.status(); + } }; template struct StatusCastImpl&> { - static absl::Status Cast(const absl::StatusOr& t) { return t.status(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + const absl::StatusOr& t) { + return t.status(); + } }; // StatusCast<> allows casting from one status-bearing type to another, @@ -88,7 +103,7 @@ struct StatusCastImpl&> { // For cases where the status is guaranteed to be a failure (and hence not // needing to preserve values) see FailureStatusCast<> below. template -To StatusCast(From&& from) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To StatusCast(From&& from) { return StatusCastImpl::Cast(std::forward(from)); } @@ -97,16 +112,22 @@ struct FailureStatusCastImpl : public StatusCastImpl {}; template struct FailureStatusCastImpl, absl::Status> { - static absl::StatusOr Cast(absl::Status&& t) { return std::move(t); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + absl::Status&& t) { + return std::move(t); + } }; template struct FailureStatusCastImpl, const absl::Status&> { - static absl::StatusOr Cast(const absl::Status& t) { return t; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + const absl::Status& t) { + return t; + } }; template -To FailureStatusCast(From&& from) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION To FailureStatusCast(From&& from) { DCHECK(!IsStatusOk(from)); return FailureStatusCastImpl::Cast(std::forward(from)); } diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h index 4aefd1a308..62a4c8de56 100644 --- a/src/core/lib/promise/for_each.h +++ b/src/core/lib/promise/for_each.h @@ -21,10 +21,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include #include #include "src/core/lib/debug/trace.h" @@ -47,14 +47,17 @@ struct Done; template <> struct Done { - static absl::Status Make(bool cancelled) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Make( + bool cancelled) { return cancelled ? absl::CancelledError() : absl::OkStatus(); } }; template <> struct Done { - static StatusFlag Make(bool cancelled) { return StatusFlag(!cancelled); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static StatusFlag Make(bool cancelled) { + return StatusFlag(!cancelled); + } }; template @@ -70,20 +73,23 @@ template struct NextValueTraits> { using Value = typename T::value_type; - static NextValueType Type(const T& t) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static NextValueType Type(const T& t) { if (t.has_value()) return NextValueType::kValue; if (t.cancelled()) return NextValueType::kError; return NextValueType::kEndOfStream; } - static Value& MutableValue(T& t) { return *t; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Value& MutableValue(T& t) { + return *t; + } }; template struct NextValueTraits>> { using Value = T; - static NextValueType Type(const ValueOrFailure>& t) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static NextValueType Type( + const ValueOrFailure>& t) { if (t.ok()) { if (t.value().has_value()) return NextValueType::kValue; return NextValueType::kEndOfStream; @@ -91,7 +97,8 @@ struct NextValueTraits>> { return NextValueType::kError; } - static Value& MutableValue(ValueOrFailure>& t) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Value& MutableValue( + ValueOrFailure>& t) { return **t; } }; @@ -110,13 +117,14 @@ class ForEach { public: using Result = typename PollTraits()())>::Type; - ForEach(Reader reader, Action action, DebugLocation whence = {}) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ForEach(Reader reader, Action action, + DebugLocation whence = {}) : reader_(std::move(reader)), action_factory_(std::move(action)), whence_(whence) { Construct(&reader_next_, reader_.Next()); } - ~ForEach() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~ForEach() { if (reading_next_) { Destruct(&reader_next_); } else { @@ -163,17 +171,16 @@ class ForEach { ":", whence_.line(), "]: "); } - Poll PollReaderNext() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll PollReaderNext() { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollReaderNext", DebugTag().c_str()); + LOG(INFO) << DebugTag() << " PollReaderNext"; } auto r = reader_next_(); if (auto* p = r.value_if_ready()) { switch (NextValueTraits::Type(*p)) { case NextValueType::kValue: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollReaderNext: got value", - DebugTag().c_str()); + LOG(INFO) << DebugTag() << " PollReaderNext: got value"; } Destruct(&reader_next_); auto action = action_factory_.Make( @@ -184,15 +191,13 @@ class ForEach { } case NextValueType::kEndOfStream: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollReaderNext: got end of stream", - DebugTag().c_str()); + LOG(INFO) << DebugTag() << " PollReaderNext: got end of stream"; } return Done::Make(false); } case NextValueType::kError: { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollReaderNext: got error", - DebugTag().c_str()); + LOG(INFO) << DebugTag() << " PollReaderNext: got error"; } return Done::Make(true); } @@ -203,7 +208,7 @@ class ForEach { Poll PollAction() { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s PollAction", DebugTag().c_str()); + LOG(INFO) << DebugTag() << " PollAction"; } auto r = in_action_.promise(); if (auto* p = r.value_if_ready()) { @@ -233,8 +238,8 @@ class ForEach { /// For each item acquired by calling Reader::Next, run the promise Action. template -for_each_detail::ForEach ForEach(Reader reader, Action action, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION for_each_detail::ForEach +ForEach(Reader reader, Action action, DebugLocation whence = {}) { return for_each_detail::ForEach(std::move(reader), std::move(action), whence); } diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h index 9dbef2acc8..ed50744b40 100644 --- a/src/core/lib/promise/if.h +++ b/src/core/lib/promise/if.h @@ -33,8 +33,8 @@ namespace grpc_core { namespace promise_detail { template -typename CallPoll::PollResult ChooseIf(CallPoll call_poll, bool result, - T* if_true, F* if_false) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION typename CallPoll::PollResult ChooseIf( + CallPoll call_poll, bool result, T* if_true, F* if_false) { if (result) { auto promise = if_true->Make(); return call_poll(promise); @@ -45,9 +45,8 @@ typename CallPoll::PollResult ChooseIf(CallPoll call_poll, bool result, } template -typename CallPoll::PollResult ChooseIf(CallPoll call_poll, - absl::StatusOr result, T* if_true, - F* if_false) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION typename CallPoll::PollResult ChooseIf( + CallPoll call_poll, absl::StatusOr result, T* if_true, F* if_false) { if (!result.ok()) { return typename CallPoll::PollResult(result.status()); } else if (*result) { @@ -71,12 +70,12 @@ class If { typename PollTraits()())>::Type; public: - If(C condition, T if_true, F if_false) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION If(C condition, T if_true, F if_false) : state_(Evaluating{ConditionPromise(std::move(condition)), TrueFactory(std::move(if_true)), FalseFactory(std::move(if_false))}) {} - Poll operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { return absl::visit(CallPoll{this}, state_); } @@ -95,7 +94,8 @@ class If { If* const self; - PollResult operator()(Evaluating& evaluating) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION PollResult + operator()(Evaluating& evaluating) const { static_assert( !kSetState, "shouldn't need to set state coming through the initial branch"); @@ -108,7 +108,8 @@ class If { } template - PollResult operator()(Promise& promise) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION PollResult + operator()(Promise& promise) const { auto r = promise(); if (kSetState && r.pending()) { self->state_.template emplace(std::move(promise)); @@ -129,7 +130,8 @@ class If { typename PollTraits()())>::Type; public: - If(bool condition, T if_true, F if_false) : condition_(condition) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION If(bool condition, T if_true, F if_false) + : condition_(condition) { TrueFactory true_factory(std::move(if_true)); FalseFactory false_factory(std::move(if_false)); if (condition_) { @@ -138,7 +140,7 @@ class If { Construct(&if_false_, false_factory.Make()); } } - ~If() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~If() { if (condition_) { Destruct(&if_true_); } else { @@ -148,21 +150,22 @@ class If { If(const If&) = delete; If& operator=(const If&) = delete; - If(If&& other) noexcept : condition_(other.condition_) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION If(If&& other) noexcept + : condition_(other.condition_) { if (condition_) { Construct(&if_true_, std::move(other.if_true_)); } else { Construct(&if_false_, std::move(other.if_false_)); } } - If& operator=(If&& other) noexcept { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION If& operator=(If&& other) noexcept { if (&other == this) return *this; Destruct(this); Construct(this, std::move(other)); return *this; } - Poll operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { #ifndef NDEBUG asan_canary_ = std::make_unique(1 + *asan_canary_); #endif @@ -197,7 +200,8 @@ class If { // This makes it safe to capture lambda arguments in the promise factory by // reference. template -promise_detail::If If(C condition, T if_true, F if_false) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::If If( + C condition, T if_true, F if_false) { return promise_detail::If(std::move(condition), std::move(if_true), std::move(if_false)); } diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h index fe5bac1a4d..dc36c2ee28 100644 --- a/src/core/lib/promise/interceptor_list.h +++ b/src/core/lib/promise/interceptor_list.h @@ -23,11 +23,11 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" -#include #include #include "src/core/lib/gprpp/construct_destruct.h" @@ -88,8 +88,8 @@ class InterceptorList { RunPromise(size_t memory_required, Map** factory, absl::optional value) { if (!value.has_value() || *factory == nullptr) { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, - "InterceptorList::RunPromise[%p]: create immediate", this); + VLOG(2) << "InterceptorList::RunPromise[" << this + << "]: create immediate"; } is_immediately_resolved_ = true; Construct(&result_, std::move(value)); @@ -101,16 +101,15 @@ class InterceptorList { async_resolution_.current_factory = *factory; async_resolution_.first_factory = factory; if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, - "InterceptorList::RunPromise[%p]: create async; mem=%p", this, - async_resolution_.space.get()); + VLOG(2) << "InterceptorList::RunPromise[" << this + << "]: create async; mem=" << async_resolution_.space.get(); } } } ~RunPromise() { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "InterceptorList::RunPromise[%p]: destroy", this); + VLOG(2) << "InterceptorList::RunPromise[" << this << "]: destroy"; } if (is_immediately_resolved_) { Destruct(&result_); @@ -129,8 +128,8 @@ class InterceptorList { RunPromise(RunPromise&& other) noexcept : is_immediately_resolved_(other.is_immediately_resolved_) { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "InterceptorList::RunPromise[%p]: move from %p", - this, &other); + VLOG(2) << "InterceptorList::RunPromise[" << this << "]: move from " + << &other; } if (is_immediately_resolved_) { Construct(&result_, std::move(other.result_)); @@ -143,8 +142,8 @@ class InterceptorList { Poll> operator()() { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "InterceptorList::RunPromise[%p]: %s", this, - DebugString().c_str()); + VLOG(2) << "InterceptorList::RunPromise[" << this + << "]: " << DebugString(); } if (is_immediately_resolved_) return std::move(result_); while (true) { @@ -161,8 +160,8 @@ class InterceptorList { async_resolution_.current_factory->next(); if (!p->has_value()) async_resolution_.current_factory = nullptr; if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "InterceptorList::RunPromise[%p]: %s", this, - DebugString().c_str()); + VLOG(2) << "InterceptorList::RunPromise[" << this + << "]: " << DebugString(); } if (async_resolution_.current_factory == nullptr) { return std::move(*p); diff --git a/src/core/lib/promise/latch.h b/src/core/lib/promise/latch.h index 5504d10f13..e946cd739d 100644 --- a/src/core/lib/promise/latch.h +++ b/src/core/lib/promise/latch.h @@ -22,9 +22,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" -#include #include #include "src/core/lib/debug/trace.h" @@ -68,8 +68,7 @@ class Latch { #endif return [this]() -> Poll { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sWait %s", DebugTag().c_str(), - StateString().c_str()); + LOG(INFO) << DebugTag() << "Wait " << StateString(); } if (has_value_) { return std::move(value_); @@ -87,8 +86,7 @@ class Latch { #endif return [this]() -> Poll { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sWaitAndCopy %s", DebugTag().c_str(), - StateString().c_str()); + LOG(INFO) << DebugTag() << "WaitAndCopy " << StateString(); } if (has_value_) { return value_; @@ -101,7 +99,7 @@ class Latch { // Set the value of the latch. Can only be called once. void Set(T value) { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str()); + LOG(INFO) << DebugTag() << "Set " << StateString(); } DCHECK(!has_value_); value_ = std::move(value); @@ -164,8 +162,7 @@ class Latch { #endif return [this]() -> Poll { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sPollWait %s", DebugTag().c_str(), - StateString().c_str()); + LOG(INFO) << DebugTag() << "PollWait " << StateString(); } if (is_set_) { return Empty{}; @@ -178,7 +175,7 @@ class Latch { // Set the latch. Can only be called once. void Set() { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str()); + LOG(INFO) << DebugTag() << "Set " << StateString(); } DCHECK(!is_set_); is_set_ = true; @@ -227,8 +224,7 @@ class ExternallyObservableLatch { auto Wait() { return [this]() -> Poll { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sPollWait %s", DebugTag().c_str(), - StateString().c_str()); + LOG(INFO) << DebugTag() << "PollWait " << StateString(); } if (IsSet()) { return Empty{}; @@ -241,7 +237,7 @@ class ExternallyObservableLatch { // Set the latch. void Set() { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sSet %s", DebugTag().c_str(), StateString().c_str()); + LOG(INFO) << DebugTag() << "Set " << StateString(); } is_set_.store(true, std::memory_order_relaxed); waiter_.Wake(); @@ -251,8 +247,7 @@ class ExternallyObservableLatch { void Reset() { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%sReset %s", DebugTag().c_str(), - StateString().c_str()); + LOG(INFO) << DebugTag() << "Reset " << StateString(); } is_set_.store(false, std::memory_order_relaxed); } diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h index 8b4f99286d..acfabce2e7 100644 --- a/src/core/lib/promise/loop.h +++ b/src/core/lib/promise/loop.h @@ -46,13 +46,17 @@ struct LoopTraits; template struct LoopTraits> { using Result = T; - static LoopCtl ToLoopCtl(LoopCtl value) { return value; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static LoopCtl ToLoopCtl( + LoopCtl value) { + return value; + } }; template struct LoopTraits>> { using Result = absl::StatusOr; - static LoopCtl ToLoopCtl(absl::StatusOr> value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static LoopCtl ToLoopCtl( + absl::StatusOr> value) { if (!value.ok()) return value.status(); auto& inner = *value; if (absl::holds_alternative(inner)) return Continue{}; @@ -63,7 +67,7 @@ struct LoopTraits>> { template <> struct LoopTraits>> { using Result = absl::Status; - static LoopCtl ToLoopCtl( + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static LoopCtl ToLoopCtl( absl::StatusOr> value) { if (!value.ok()) return value.status(); const auto& inner = *value; @@ -82,12 +86,13 @@ class Loop { public: using Result = typename LoopTraits::Result; - explicit Loop(F f) : factory_(std::move(f)) {} - ~Loop() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Loop(F f) + : factory_(std::move(f)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~Loop() { if (started_) Destruct(&promise_); } - Loop(Loop&& loop) noexcept + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Loop(Loop&& loop) noexcept : factory_(std::move(loop.factory_)), started_(loop.started_) { if (started_) Construct(&promise_, std::move(loop.promise_)); } @@ -95,7 +100,7 @@ class Loop { Loop(const Loop& loop) = delete; Loop& operator=(const Loop& loop) = delete; - Poll operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { if (!started_) { started_ = true; Construct(&promise_, factory_.Make()); @@ -136,7 +141,7 @@ class Loop { // Expects F returns LoopCtl - if it's Continue, then run the loop again - // otherwise yield the returned value as the result of the loop. template -promise_detail::Loop Loop(F f) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Loop Loop(F f) { return promise_detail::Loop(std::move(f)); } diff --git a/src/core/lib/promise/map.h b/src/core/lib/promise/map.h index b1772ad5b5..a2a2a773ee 100644 --- a/src/core/lib/promise/map.h +++ b/src/core/lib/promise/map.h @@ -35,7 +35,7 @@ namespace promise_detail { template class Map { public: - Map(Promise promise, Fn fn) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Map(Promise promise, Fn fn) : promise_(std::move(promise)), fn_(std::move(fn)) {} Map(const Map&) = delete; @@ -49,7 +49,7 @@ class Map { using Result = RemoveCVRef()(std::declval()))>; - Poll operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { Poll r = promise_(); if (auto* p = r.value_if_ready()) { return fn_(std::move(*p)); @@ -68,7 +68,8 @@ class Map { // Takes a promise, and a synchronous function to mutate its result, and // returns a promise. template -promise_detail::Map Map(Promise promise, Fn fn) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Map Map( + Promise promise, Fn fn) { return promise_detail::Map(std::move(promise), std::move(fn)); } @@ -76,7 +77,7 @@ promise_detail::Map Map(Promise promise, Fn fn) { // and a bool indicating whether there was ever a Pending{} value observed from // polling. template -auto CheckDelayed(Promise promise) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto CheckDelayed(Promise promise) { using P = promise_detail::PromiseLike; return [delayed = false, promise = P(std::move(promise))]() mutable -> Poll> { @@ -93,13 +94,13 @@ auto CheckDelayed(Promise promise) { template struct JustElem { template - auto operator()(std::tuple&& t) const - -> decltype(std::get(std::forward>(t))) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()(std::tuple&& t) + const -> decltype(std::get(std::forward>(t))) { return std::get(std::forward>(t)); } template - auto operator()(const std::tuple& t) const - -> decltype(std::get(t)) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()( + const std::tuple& t) const -> decltype(std::get(t)) { return std::get(t); } }; diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc index 5a14f235cf..f1a9f70f77 100644 --- a/src/core/lib/promise/party.cc +++ b/src/core/lib/promise/party.cc @@ -18,14 +18,16 @@ #include "absl/base/thread_annotations.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" -#include #include +#include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/activity.h" +#include "src/core/util/latent_see.h" #ifdef GRPC_MAXIMIZE_THREADYNESS #include "src/core/lib/gprpp/thd.h" // IWYU pragma: keep @@ -34,11 +36,6 @@ namespace grpc_core { -namespace { -// TODO(ctiller): Once all activities are parties we can remove this. -thread_local Party** g_current_party_run_next = nullptr; -} // namespace - /////////////////////////////////////////////////////////////////////////////// // PartySyncUsingAtomics @@ -178,7 +175,9 @@ Party::Participant::~Participant() { Party::~Party() {} void Party::CancelRemainingParticipants() { + if (!sync_.has_participants()) return; ScopedActivity activity(this); + promise_detail::Context arena_ctx(arena_.get()); for (size_t i = 0; i < party_detail::kMaxParticipants; i++) { if (auto* p = participants_[i].exchange(nullptr, std::memory_order_acquire)) { @@ -210,77 +209,92 @@ void Party::ForceImmediateRepoll(WakeupMask mask) { sync_.ForceImmediateRepoll(mask); } -void Party::RunLocked() { - // If there is a party running, then we don't run it immediately - // but instead add it to the end of the list of parties to run. - // This enables a fairly straightforward batching of work from a - // call to a transport (or back again). - if (g_current_party_run_next != nullptr) { - if (*g_current_party_run_next == nullptr) { - *g_current_party_run_next = this; - } else { - // But if there's already a party queued, we're better off asking event - // engine to run it so we can spread load. - event_engine()->Run([this]() { - ApplicationCallbackExecCtx app_exec_ctx; - ExecCtx exec_ctx; - RunLocked(); - }); - } - return; - } - auto body = [this]() { - DCHECK_EQ(g_current_party_run_next, nullptr); - Party* run_next = nullptr; - g_current_party_run_next = &run_next; - const bool done = RunParty(); - DCHECK(g_current_party_run_next == &run_next); - g_current_party_run_next = nullptr; - if (done) { - ScopedActivity activity(this); - PartyOver(); - } - if (run_next != nullptr) { - run_next->RunLocked(); - } - }; +void Party::RunLocked(Party* party) { + GRPC_LATENT_SEE_PARENT_SCOPE("Party::RunLocked"); #ifdef GRPC_MAXIMIZE_THREADYNESS Thread thd( "RunParty", - [body]() { + [party]() { ApplicationCallbackExecCtx app_exec_ctx; ExecCtx exec_ctx; - body(); + if (party->RunParty()) party->PartyIsOver(); }, nullptr, Thread::Options().set_joinable(false)); thd.Start(); #else - body(); + struct RunState; + static thread_local RunState* g_run_state = nullptr; + struct RunState { + explicit RunState(Party* party) : running(party), next(nullptr) {} + Party* running; + Party* next; + void Run() { + g_run_state = this; + do { + GRPC_LATENT_SEE_INNER_SCOPE("run_one_party"); + if (running->RunParty()) { + running->PartyIsOver(); + } + running = std::exchange(next, nullptr); + } while (running != nullptr); + DCHECK(g_run_state == this); + g_run_state = nullptr; + } + }; + // If there is a party running, then we don't run it immediately + // but instead add it to the end of the list of parties to run. + // This enables a fairly straightforward batching of work from a + // call to a transport (or back again). + if (g_run_state != nullptr) { + if (g_run_state->running == party || g_run_state->next == party) { + // Already running or already queued. + return; + } + if (g_run_state->next != nullptr) { + // If there's already a different party queued, we're better off asking + // event engine to run it so we can spread load. + // We swap the oldest party to run on the event engine so that we don't + // accidentally end up with a tail latency problem whereby one party + // gets held for a really long time. + std::swap(g_run_state->next, party); + party->arena_->GetContext() + ->Run([party]() { + GRPC_LATENT_SEE_PARENT_SCOPE("Party::RunLocked offload"); + ApplicationCallbackExecCtx app_exec_ctx; + ExecCtx exec_ctx; + RunState{party}.Run(); + }); + return; + } + g_run_state->next = party; + return; + } + RunState{party}.Run(); #endif } bool Party::RunParty() { ScopedActivity activity(this); + promise_detail::Context arena_ctx(arena_.get()); return sync_.RunParty([this](int i) { return RunOneParticipant(i); }); } bool Party::RunOneParticipant(int i) { + GRPC_LATENT_SEE_INNER_SCOPE("Party::RunOneParticipant"); // If the participant is null, skip. // This allows participants to complete whilst wakers still exist // somewhere. auto* participant = participants_[i].load(std::memory_order_acquire); if (participant == nullptr) { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_INFO, "%s[party] wakeup %d already complete", - DebugTag().c_str(), i); + LOG(INFO) << DebugTag() << "[party] wakeup " << i << " already complete"; } return false; } absl::string_view name; if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { name = participant->name(); - gpr_log(GPR_INFO, "%s[%s] begin job %d", DebugTag().c_str(), - std::string(name).c_str(), i); + LOG(INFO) << DebugTag() << "[" << name << "] begin job " << i; } // Poll the participant. currently_polling_ = i; @@ -288,13 +302,13 @@ bool Party::RunOneParticipant(int i) { currently_polling_ = kNotPolling; if (done) { if (!name.empty()) { - gpr_log(GPR_INFO, "%s[%s] end poll and finish job %d", DebugTag().c_str(), - std::string(name).c_str(), i); + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "[" << name << "] end poll and finish job " << i; } participants_[i].store(nullptr, std::memory_order_relaxed); } else if (!name.empty()) { - gpr_log(GPR_INFO, "%s[%s] end poll", DebugTag().c_str(), - std::string(name).c_str()); + GRPC_TRACE_LOG(promise_primitives, INFO) + << DebugTag() << "[" << name << "] end poll"; } return done; } @@ -304,32 +318,31 @@ void Party::AddParticipants(Participant** participants, size_t count) { count](size_t* slots) { for (size_t i = 0; i < count; i++) { if (GRPC_TRACE_FLAG_ENABLED(party_state)) { - gpr_log(GPR_INFO, - "Party %p AddParticipant: %s @ %" PRIdPTR - " [participant=%p]", - &sync_, std::string(participants[i]->name()).c_str(), slots[i], - participants[i]); + LOG(INFO) << "Party " << &sync_ << " AddParticipant: " + << participants[i]->name() << " @ " << slots[i] + << " [participant=" << participants[i] << "]"; } participants_[slots[i]].store(participants[i], std::memory_order_release); } }); - if (run_party) RunLocked(); + if (run_party) RunLocked(this); Unref(); } void Party::Wakeup(WakeupMask wakeup_mask) { - if (sync_.ScheduleWakeup(wakeup_mask)) RunLocked(); + if (sync_.ScheduleWakeup(wakeup_mask)) RunLocked(this); Unref(); } void Party::WakeupAsync(WakeupMask wakeup_mask) { if (sync_.ScheduleWakeup(wakeup_mask)) { - event_engine()->Run([this]() { - ApplicationCallbackExecCtx app_exec_ctx; - ExecCtx exec_ctx; - RunLocked(); - Unref(); - }); + arena_->GetContext()->Run( + [this]() { + ApplicationCallbackExecCtx app_exec_ctx; + ExecCtx exec_ctx; + RunLocked(this); + Unref(); + }); } else { Unref(); } @@ -338,8 +351,14 @@ void Party::WakeupAsync(WakeupMask wakeup_mask) { void Party::Drop(WakeupMask) { Unref(); } void Party::PartyIsOver() { - ScopedActivity activity(this); - PartyOver(); + auto arena = arena_; + { + ScopedActivity activity(this); + promise_detail::Context arena_ctx(arena_.get()); + CancelRemainingParticipants(); + arena->DestroyManagedNewObjects(); + } + this->~Party(); } } // namespace grpc_core diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h index 6a1894ff2b..36544c601c 100644 --- a/src/core/lib/promise/party.h +++ b/src/core/lib/promise/party.h @@ -25,10 +25,10 @@ #include "absl/base/attributes.h" #include "absl/base/thread_annotations.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/string_view.h" #include -#include #include #include "src/core/lib/debug/trace.h" @@ -41,6 +41,8 @@ #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/util/useful.h" // Two implementations of party synchronization are provided: one using a single // atomic, the other using a mutex and a set of state variables. @@ -83,7 +85,7 @@ class PartySyncUsingAtomics { } GRPC_MUST_USE_RESULT bool RefIfNonZero(); // Returns true if the ref count is now zero and the caller should call - // PartyOver + // PartyIsOver GRPC_MUST_USE_RESULT bool Unref() { const uint64_t prev_state = state_.fetch_sub(kOneRef, std::memory_order_acq_rel); @@ -106,31 +108,28 @@ class PartySyncUsingAtomics { // participant completed and should be removed from the allocated set. template GRPC_MUST_USE_RESULT bool RunParty(F poll_one_participant) { - uint64_t prev_state; - iteration_.fetch_add(1, std::memory_order_relaxed); + // Grab the current state, and clear the wakeup bits & add flag. + uint64_t prev_state = state_.fetch_and(kRefMask | kLocked | kAllocatedMask, + std::memory_order_acquire); + LogStateChange("Run", prev_state, + prev_state & (kRefMask | kLocked | kAllocatedMask)); + CHECK(prev_state & kLocked); + if (prev_state & kDestroying) return true; + // From the previous state, extract which participants we're to wakeup. + uint64_t wakeups = prev_state & kWakeupMask; + // Now update prev_state to be what we want the CAS to see below. + prev_state &= kRefMask | kLocked | kAllocatedMask; for (;;) { - // Grab the current state, and clear the wakeup bits & add flag. - prev_state = state_.fetch_and(kRefMask | kLocked | kAllocatedMask, - std::memory_order_acquire); - LogStateChange("Run", prev_state, - prev_state & (kRefMask | kLocked | kAllocatedMask)); - CHECK(prev_state & kLocked); - if (prev_state & kDestroying) return true; - // From the previous state, extract which participants we're to wakeup. - uint64_t wakeups = prev_state & kWakeupMask; - // Now update prev_state to be what we want the CAS to see below. - prev_state &= kRefMask | kLocked | kAllocatedMask; + uint64_t keep_allocated_mask = kAllocatedMask; // For each wakeup bit... - for (size_t i = 0; wakeups != 0; i++, wakeups >>= 1) { + while (wakeups != 0) { + uint64_t t = LowestOneBit(wakeups); + const int i = CountTrailingZeros(t); + wakeups ^= t; // If the bit is not set, skip. - if ((wakeups & 1) == 0) continue; if (poll_one_participant(i)) { const uint64_t allocated_bit = (1u << i << kAllocatedShift); - prev_state &= ~allocated_bit; - uint64_t finished_prev_state = - state_.fetch_and(~allocated_bit, std::memory_order_release); - LogStateChange("Run:ParticipantComplete", finished_prev_state, - finished_prev_state & ~allocated_bit); + keep_allocated_mask &= ~allocated_bit; } } // Try to CAS the state we expected to have (with no wakeups or adds) @@ -144,26 +143,27 @@ class PartySyncUsingAtomics { // TODO(ctiller): consider mitigations for the accidental wakeup on owning // waker creation case -- I currently expect this will be more expensive // than this quick loop. - if (wake_after_poll_ == 0) { - if (state_.compare_exchange_weak( - prev_state, (prev_state & (kRefMask | kAllocatedMask)), - std::memory_order_acq_rel, std::memory_order_acquire)) { - LogStateChange("Run:End", prev_state, - prev_state & (kRefMask | kAllocatedMask)); - return false; - } - } else { - if (state_.compare_exchange_weak( - prev_state, - (prev_state & (kRefMask | kAllocatedMask | kLocked)) | - wake_after_poll_, - std::memory_order_acq_rel, std::memory_order_acquire)) { - LogStateChange("Run:EndIteration", prev_state, - prev_state & (kRefMask | kAllocatedMask)); - iteration_.fetch_add(1, std::memory_order_relaxed); - wake_after_poll_ = 0; - } + if (state_.compare_exchange_weak( + prev_state, (prev_state & (kRefMask | keep_allocated_mask)), + std::memory_order_acq_rel, std::memory_order_acquire)) { + LogStateChange("Run:End", prev_state, + prev_state & (kRefMask | kAllocatedMask)); + return false; + } + while (!state_.compare_exchange_weak( + prev_state, + prev_state & (kRefMask | kLocked | keep_allocated_mask))) { + // Nothing to do here. } + LogStateChange("Run:Continue", prev_state, + prev_state & (kRefMask | kLocked | keep_allocated_mask)); + CHECK(prev_state & kLocked); + if (prev_state & kDestroying) return true; + // From the previous state, extract which participants we're to wakeup. + wakeups = prev_state & kWakeupMask; + // Now update prev_state to be what we want the CAS to see once wakeups + // complete next iteration. + prev_state &= kRefMask | kLocked | keep_allocated_mask; } return false; } @@ -186,15 +186,12 @@ class PartySyncUsingAtomics { do { wakeup_mask = 0; allocated = (state & kAllocatedMask) >> kAllocatedShift; - size_t n = 0; - for (size_t bit = 0; n < count && bit < party_detail::kMaxParticipants; - bit++) { - if (allocated & (1 << bit)) continue; - wakeup_mask |= (1 << bit); - slots[n++] = bit; - allocated |= 1 << bit; + for (size_t i = 0; i < count; i++) { + auto new_mask = LowestOneBit(~allocated); + wakeup_mask |= new_mask; + allocated |= new_mask; + slots[i] = CountTrailingZeros(new_mask); } - CHECK(n == count); // Try to allocate this slot and take a ref (atomically). // Ref needs to be taken because once we store the participant it could be // spuriously woken up and unref the party. @@ -219,9 +216,8 @@ class PartySyncUsingAtomics { // Returns true if the caller should run the party. GRPC_MUST_USE_RESULT bool ScheduleWakeup(WakeupMask mask); - void WakeAfterPoll(WakeupMask mask) { wake_after_poll_ |= mask; } - uint32_t iteration() const { - return iteration_.load(std::memory_order_relaxed); + bool has_participants() const { + return (state_.load(std::memory_order_relaxed) & kAllocatedMask) != 0; } private: @@ -230,9 +226,9 @@ class PartySyncUsingAtomics { void LogStateChange(const char* op, uint64_t prev_state, uint64_t new_state, DebugLocation loc = {}) { if (GRPC_TRACE_FLAG_ENABLED(party_state)) { - gpr_log(loc.file(), loc.line(), GPR_LOG_SEVERITY_INFO, - "Party %p %30s: %016" PRIx64 " -> %016" PRIx64, this, op, - prev_state, new_state); + LOG(INFO).AtLocation(loc.file(), loc.line()) + << absl::StrFormat("Party %p %30s: %016" PRIx64 " -> %016" PRIx64, + this, op, prev_state, new_state); } } @@ -272,8 +268,6 @@ class PartySyncUsingAtomics { static constexpr uint64_t kOneRef = 1ull << kRefShift; std::atomic state_; - std::atomic iteration_{0}; - WakeupMask wake_after_poll_ = 0; }; class PartySyncUsingMutex { @@ -371,6 +365,11 @@ class Party : public Activity, private Wakeable { Party(const Party&) = delete; Party& operator=(const Party&) = delete; + static RefCountedPtr Make(RefCountedPtr arena) { + auto* arena_ptr = arena.get(); + return RefCountedPtr(arena_ptr->New(std::move(arena))); + } + // Spawn one promise into the party. // The promise will be polled until it is resolved, or until the party is shut // down. @@ -410,19 +409,7 @@ class Party : public Activity, private Wakeable { return RefCountedPtr(this); } - // Return a promise that resolves to Empty{} when the current party poll is - // complete. - // This is useful for implementing batching and the like: we can hold some - // action until the rest of the party resolves itself. - auto AfterCurrentPoll() { - DCHECK(GetContext() == this); - sync_.WakeAfterPoll(CurrentParticipant()); - return [this, iteration = sync_.iteration()]() -> Poll { - DCHECK(GetContext() == this); - if (iteration == sync_.iteration()) return Pending{}; - return Empty{}; - }; - } + Arena* arena() { return arena_.get(); } class BulkSpawner { public: @@ -442,26 +429,21 @@ class Party : public Activity, private Wakeable { }; protected: - explicit Party(size_t initial_refs) : sync_(initial_refs) {} + friend class Arena; + + // Derived types should be constructed upon `arena`. + explicit Party(RefCountedPtr arena) + : sync_(1), arena_(std::move(arena)) {} ~Party() override; // Main run loop. Must be locked. // Polls participants and drains the add queue until there is no work left to // be done. - // Derived types will likely want to override this to set up their - // contexts before polling. - // Should not be called by derived types except as a tail call to the base - // class RunParty when overriding this method to add custom context. // Returns true if the party is over. - GRPC_MUST_USE_RESULT virtual bool RunParty(); + GRPC_MUST_USE_RESULT bool RunParty(); bool RefIfNonZero() { return sync_.RefIfNonZero(); } - // Destroy any remaining participants. - // Should be called by derived types in response to PartyOver. - // Needs to have normal context setup before calling. - void CancelRemainingParticipants(); - private: // Concrete implementation of a participant for some promise & oncomplete // type. @@ -594,13 +576,12 @@ class Party : public Activity, private Wakeable { std::atomic state_{State::kFactory}; }; - // Notification that the party has finished and this instance can be deleted. - // Derived types should arrange to call CancelRemainingParticipants during - // this sequence. - virtual void PartyOver() = 0; + // Destroy any remaining participants. + // Needs to have normal context setup before calling. + void CancelRemainingParticipants(); // Run the locked part of the party until it is unlocked. - void RunLocked(); + static void RunLocked(Party* party); // Called in response to Unref() hitting zero - ultimately calls PartyOver, // but needs to set some stuff up. // Here so it gets compiled out of line. @@ -615,9 +596,6 @@ class Party : public Activity, private Wakeable { void AddParticipants(Participant** participant, size_t count); bool RunOneParticipant(int i); - virtual grpc_event_engine::experimental::EventEngine* event_engine() - const = 0; - // Sentinal value for currently_polling_ when no participant is being polled. static constexpr uint8_t kNotPolling = 255; @@ -634,6 +612,7 @@ class Party : public Activity, private Wakeable { // If the lower bit is unset, then this is a Participant*. // If the lower bit is set, then this is a ParticipantFactory*. std::atomic participants_[party_detail::kMaxParticipants] = {}; + RefCountedPtr arena_; }; template <> diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h index 9c896682fe..86f0b98d8e 100644 --- a/src/core/lib/promise/pipe.h +++ b/src/core/lib/promise/pipe.h @@ -28,7 +28,6 @@ #include "absl/types/optional.h" #include "absl/types/variant.h" -#include #include #include "src/core/lib/gprpp/debug_location.h" @@ -636,8 +635,8 @@ class Push { Poll operator()() { if (center_ == nullptr) { if (GRPC_TRACE_FLAG_ENABLED(promise_primitives)) { - gpr_log(GPR_DEBUG, "%s Pipe push has a null center", - GetContext()->DebugTag().c_str()); + VLOG(2) << GetContext()->DebugTag() + << " Pipe push has a null center"; } return false; } diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h index f23340d9eb..7e26b7b366 100644 --- a/src/core/lib/promise/poll.h +++ b/src/core/lib/promise/poll.h @@ -20,6 +20,7 @@ #include "absl/log/check.h" #include "absl/strings/str_format.h" +#include "absl/types/optional.h" #include #include @@ -32,12 +33,22 @@ namespace grpc_core { // Allows writing 'return Pending{}' and with automatic conversions gets // upgraded to a Poll<> object. struct Pending {}; -inline bool operator==(const Pending&, const Pending&) { return true; } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(const Pending&, + const Pending&) { + return true; +} // A type that contains no value. Useful for simulating 'void' in promises that // always need to return some kind of value. struct Empty {}; -inline bool operator==(const Empty&, const Empty&) { return true; } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(const Empty&, + const Empty&) { + return true; +} +template +void AbslStringify(Sink& sink, Empty) { + sink.Append("{}"); +} // The result of polling a Promise once. // @@ -47,15 +58,17 @@ template class Poll { public: // NOLINTNEXTLINE(google-explicit-constructor) - Poll(Pending) : ready_(false) {} - Poll() : ready_(false) {} - Poll(const Poll& other) : ready_(other.ready_) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(Pending) : ready_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll() : ready_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(const Poll& other) + : ready_(other.ready_) { if (ready_) Construct(&value_, other.value_); } - Poll(Poll&& other) noexcept : ready_(other.ready_) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(Poll&& other) noexcept + : ready_(other.ready_) { if (ready_) Construct(&value_, std::move(other.value_)); } - Poll& operator=(const Poll& other) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll& operator=(const Poll& other) { if (ready_) { if (other.ready_) { value_ = other.value_; @@ -69,7 +82,7 @@ class Poll { } return *this; } - Poll& operator=(Poll&& other) noexcept { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll& operator=(Poll&& other) noexcept { if (ready_) { if (other.ready_) { value_ = std::move(other.value_); @@ -85,34 +98,36 @@ class Poll { } template // NOLINTNEXTLINE(google-explicit-constructor) - Poll(U value) : ready_(true) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(U value) : ready_(true) { Construct(&value_, std::move(value)); } // NOLINTNEXTLINE(google-explicit-constructor) - Poll(T&& value) : ready_(true) { Construct(&value_, std::forward(value)); } - ~Poll() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(T&& value) : ready_(true) { + Construct(&value_, std::forward(value)); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION ~Poll() { if (ready_) Destruct(&value_); } - bool pending() const { return !ready_; } - bool ready() const { return ready_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool pending() const { return !ready_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool ready() const { return ready_; } - T& value() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T& value() { DCHECK(ready()); return value_; } - const T& value() const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T& value() const { DCHECK(ready()); return value_; } - T* value_if_ready() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* value_if_ready() { if (ready()) return &value_; return nullptr; } - const T* value_if_ready() const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T* value_if_ready() const { if (ready()) return &value_; return nullptr; } @@ -143,31 +158,31 @@ template <> class Poll { public: // NOLINTNEXTLINE(google-explicit-constructor) - Poll(Pending) : ready_(false) {} - Poll() : ready_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(Pending) : ready_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll() : ready_(false) {} Poll(const Poll& other) = default; Poll(Poll&& other) noexcept = default; Poll& operator=(const Poll& other) = default; Poll& operator=(Poll&& other) = default; // NOLINTNEXTLINE(google-explicit-constructor) - Poll(Empty) : ready_(true) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll(Empty) : ready_(true) {} ~Poll() = default; - bool pending() const { return !ready_; } - bool ready() const { return ready_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool pending() const { return !ready_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool ready() const { return ready_; } - Empty value() const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Empty value() const { DCHECK(ready()); return Empty{}; } - Empty* value_if_ready() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Empty* value_if_ready() { static Empty value; if (ready()) return &value; return nullptr; } - const Empty* value_if_ready() const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const Empty* value_if_ready() const { static Empty value; if (ready()) return &value; return nullptr; @@ -195,17 +210,22 @@ class Poll>; template struct PollTraits { using Type = T; - static constexpr bool is_poll() { return false; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static constexpr bool is_poll() { + return false; + } }; template struct PollTraits> { using Type = T; - static constexpr bool is_poll() { return true; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static constexpr bool is_poll() { + return true; + } }; template -bool operator==(const Poll& a, const Poll& b) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator==(const Poll& a, + const Poll& b) { if (a.pending() && b.pending()) return true; if (a.ready() && b.ready()) return a.value() == b.value(); return false; @@ -216,7 +236,7 @@ struct PollCastImpl; template struct PollCastImpl> { - static Poll Cast(Poll&& poll) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Cast(Poll&& poll) { if (poll.pending()) return Pending{}; return static_cast(std::move(poll.value())); } @@ -224,21 +244,27 @@ struct PollCastImpl> { template struct PollCastImpl::is_poll()>> { - static Poll Cast(U&& poll) { return Poll(T(std::move(poll))); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Cast(U&& poll) { + return Poll(T(std::move(poll))); + } }; template struct PollCastImpl { - static Poll Cast(T&& poll) { return Poll(std::move(poll)); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Cast(T&& poll) { + return Poll(std::move(poll)); + } }; template struct PollCastImpl> { - static Poll Cast(Poll&& poll) { return std::move(poll); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll Cast(Poll&& poll) { + return std::move(poll); + } }; template -Poll poll_cast(U poll) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll poll_cast(U poll) { return PollCastImpl::Cast(std::move(poll)); } @@ -262,6 +288,36 @@ void AbslStringify(Sink& sink, const Poll& poll) { absl::Format(&sink, "%v", poll.value()); } +template +void AbslStringify(Sink& sink, const Poll>& poll) { + if (poll.pending()) { + absl::Format(&sink, "<>"); + return; + } + const auto& value = poll.value(); + if (value.has_value()) { + absl::Format(&sink, "%v", value); + } else { + sink.append("nullopt"); + } +} + +// Hack to get metadata printing +template +void AbslStringify( + Sink& sink, const Poll>>& poll) { + if (poll.pending()) { + absl::Format(&sink, "<>"); + return; + } + const auto& value = poll.value(); + if (value.has_value()) { + absl::Format(&sink, "%v", *value); + } else { + sink.Append("nullopt"); + } +} + } // namespace grpc_core #endif // GRPC_SRC_CORE_LIB_PROMISE_POLL_H diff --git a/src/core/lib/promise/promise.h b/src/core/lib/promise/promise.h index 1595f2a878..cb26a16507 100644 --- a/src/core/lib/promise/promise.h +++ b/src/core/lib/promise/promise.h @@ -58,9 +58,12 @@ namespace promise_detail { template class Immediate { public: - explicit Immediate(T value) : value_(std::move(value)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Immediate(T value) + : value_(std::move(value)) {} - Poll operator()() { return std::move(value_); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { + return std::move(value_); + } private: T value_; @@ -69,13 +72,16 @@ class Immediate { // Return \a value immediately template -promise_detail::Immediate Immediate(T value) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Immediate Immediate( + T value) { return promise_detail::Immediate(std::move(value)); } // Return status Ok immediately struct ImmediateOkStatus { - Poll operator()() { return absl::OkStatus(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Poll operator()() { + return absl::OkStatus(); + } }; // Typecheck that a promise returns the expected return type. @@ -84,7 +90,7 @@ struct ImmediateOkStatus { // should fail to compile. When modifying this code these should be uncommented // and their miscompilation verified. template -auto WithResult(F f) -> +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto WithResult(F f) -> typename std::enable_if>::value, F>::type { return f; diff --git a/src/core/lib/promise/race.h b/src/core/lib/promise/race.h index e23a067979..83de1a617d 100644 --- a/src/core/lib/promise/race.h +++ b/src/core/lib/promise/race.h @@ -32,10 +32,11 @@ class Race { public: using Result = decltype(std::declval()()); - explicit Race(Promise promise, Promises... promises) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Race(Promise promise, + Promises... promises) : promise_(std::move(promise)), next_(std::move(promises)...) {} - Result operator()() { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Result operator()() { // Check our own promise. auto r = promise_(); if (r.pending()) { @@ -57,8 +58,11 @@ template class Race { public: using Result = decltype(std::declval()()); - explicit Race(Promise promise) : promise_(std::move(promise)) {} - Result operator()() { return promise_(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Race(Promise promise) + : promise_(std::move(promise)) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Result operator()() { + return promise_(); + } private: Promise promise_; @@ -70,7 +74,8 @@ class Race { /// If two results are simultaneously available, bias towards the first result /// listed. template -promise_detail::Race Race(Promises... promises) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Race Race( + Promises... promises) { return promise_detail::Race(std::move(promises)...); } diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h index f1bbb2f322..d25a8caefb 100644 --- a/src/core/lib/promise/seq.h +++ b/src/core/lib/promise/seq.h @@ -36,22 +36,27 @@ struct SeqTraits { using UnwrappedType = T; using WrappedType = T; template - static auto CallFactory(Next* next, T&& value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static auto CallFactory(Next* next, + T&& value) { return next->Make(std::forward(value)); } - static bool IsOk(const T&) { return true; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(const T&) { + return true; + } static const char* ErrorString(const T&) { abort(); } template static R ReturnValue(T&&) { abort(); } template - static auto CallSeqFactory(F& f, Elem&& elem, T&& value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static auto CallSeqFactory(F& f, + Elem&& elem, + T&& value) { return f(std::forward(elem), std::forward(value)); } template - static Poll CheckResultAndRunNext(PriorResult prior, - RunNext run_next) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Poll + CheckResultAndRunNext(PriorResult prior, RunNext run_next) { return run_next(std::move(prior)); } }; @@ -59,11 +64,15 @@ struct SeqTraits { template class Seq { public: - explicit Seq(P&& promise, Fs&&... factories, DebugLocation whence) + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit Seq(P&& promise, + Fs&&... factories, + DebugLocation whence) : state_(std::forward

(promise), std::forward(factories)..., whence) {} - auto operator()() { return state_.PollOnce(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto operator()() { + return state_.PollOnce(); + } private: SeqState state_; @@ -98,32 +107,33 @@ struct SeqIterResultTraits { // etc // Return the final value. template -F Seq(F functor) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION F Seq(F functor) { return functor; } template -promise_detail::Seq Seq(F0 f0, F1 f1, DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq Seq( + F0 f0, F1 f1, DebugLocation whence = {}) { return promise_detail::Seq(std::move(f0), std::move(f1), whence); } template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq Seq( + F0 f0, F1 f1, F2 f2, DebugLocation whence = {}) { return promise_detail::Seq(std::move(f0), std::move(f1), std::move(f2), whence); } template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq Seq( + F0 f0, F1 f1, F2 f2, F3 f3, DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), whence); } template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq +Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, DebugLocation whence = {}) { return promise_detail::Seq(std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), whence); @@ -131,9 +141,8 @@ promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, - F4 f4, F5 f5, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION promise_detail::Seq +Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), whence); @@ -141,9 +150,10 @@ promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, template -promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, - F4 f4, F5 f5, F6 f6, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, + DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), whence); @@ -151,9 +161,10 @@ promise_detail::Seq Seq(F0 f0, F1 f1, F2 f2, F3 f3, template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, + DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), whence); @@ -161,9 +172,10 @@ promise_detail::Seq Seq( template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, + DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), std::move(f8), whence); @@ -171,9 +183,10 @@ promise_detail::Seq Seq( template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, - DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, + DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9), @@ -183,9 +196,10 @@ promise_detail::Seq Seq( template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, - F10 f10, DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, + F10 f10, DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9), @@ -195,9 +209,10 @@ promise_detail::Seq Seq( template -promise_detail::Seq Seq( - F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, - F10 f10, F11 f11, DebugLocation whence = {}) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION + promise_detail::Seq + Seq(F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9, + F10 f10, F11 f11, DebugLocation whence = {}) { return promise_detail::Seq( std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4), std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9), diff --git a/src/core/lib/promise/status_flag.h b/src/core/lib/promise/status_flag.h index 132b2079c0..5dbe224955 100644 --- a/src/core/lib/promise/status_flag.h +++ b/src/core/lib/promise/status_flag.h @@ -15,9 +15,12 @@ #ifndef GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H #define GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H +#include + #include "absl/log/check.h" #include "absl/status/status.h" #include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" #include "absl/types/optional.h" #include @@ -40,43 +43,58 @@ struct Success { } }; -inline bool IsStatusOk(Failure) { return false; } -inline bool IsStatusOk(Success) { return true; } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk(Failure) { + return false; +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk(Success) { + return true; +} template <> struct StatusCastImpl { - static absl::Status Cast(Success) { return absl::OkStatus(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast(Success) { + return absl::OkStatus(); + } }; template <> struct StatusCastImpl { - static absl::Status Cast(Success) { return absl::OkStatus(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast(Success) { + return absl::OkStatus(); + } }; template <> struct StatusCastImpl { - static absl::Status Cast(Failure) { return absl::CancelledError(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast(Failure) { + return absl::CancelledError(); + } }; template struct StatusCastImpl, Failure> { - static absl::StatusOr Cast(Failure) { return absl::CancelledError(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast(Failure) { + return absl::CancelledError(); + } }; // A boolean representing whether an operation succeeded (true) or failed // (false). class StatusFlag { public: - StatusFlag() : value_(true) {} - explicit StatusFlag(bool value) : value_(value) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION StatusFlag() : value_(true) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit StatusFlag(bool value) + : value_(value) {} // NOLINTNEXTLINE(google-explicit-constructor) - StatusFlag(Failure) : value_(false) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION StatusFlag(Failure) : value_(false) {} // NOLINTNEXTLINE(google-explicit-constructor) - StatusFlag(Success) : value_(true) {} + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION StatusFlag(Success) : value_(true) {} - bool ok() const { return value_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool ok() const { return value_; } - bool operator==(StatusFlag other) const { return value_ == other.value_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator==(StatusFlag other) const { + return value_ == other.value_; + } std::string ToString() const { return value_ ? "ok" : "failed"; } template @@ -92,42 +110,78 @@ class StatusFlag { bool value_; }; -inline bool operator==(StatusFlag flag, Failure) { return !flag.ok(); } -inline bool operator==(Failure, StatusFlag flag) { return !flag.ok(); } -inline bool operator==(StatusFlag flag, Success) { return flag.ok(); } -inline bool operator==(Success, StatusFlag flag) { return flag.ok(); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(StatusFlag flag, + Failure) { + return !flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(Failure, + StatusFlag flag) { + return !flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(StatusFlag flag, + Success) { + return flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator==(Success, + StatusFlag flag) { + return flag.ok(); +} -inline bool operator!=(StatusFlag flag, Failure) { return flag.ok(); } -inline bool operator!=(Failure, StatusFlag flag) { return flag.ok(); } -inline bool operator!=(StatusFlag flag, Success) { return !flag.ok(); } -inline bool operator!=(Success, StatusFlag flag) { return !flag.ok(); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator!=(StatusFlag flag, + Failure) { + return flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator!=(Failure, + StatusFlag flag) { + return flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator!=(StatusFlag flag, + Success) { + return !flag.ok(); +} +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool operator!=(Success, + StatusFlag flag) { + return !flag.ok(); +} -inline bool IsStatusOk(const StatusFlag& flag) { return flag.ok(); } +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk( + const StatusFlag& flag) { + return flag.ok(); +} template <> struct StatusCastImpl { - static absl::Status Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + StatusFlag flag) { return flag.ok() ? absl::OkStatus() : absl::CancelledError(); } }; template <> struct StatusCastImpl { - static absl::Status Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + StatusFlag flag) { return flag.ok() ? absl::OkStatus() : absl::CancelledError(); } }; template <> struct StatusCastImpl { - static absl::Status Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::Status Cast( + StatusFlag flag) { return flag.ok() ? absl::OkStatus() : absl::CancelledError(); } }; +template <> +struct StatusCastImpl { + static StatusFlag Cast(Success) { return StatusFlag(true); } +}; + template struct FailureStatusCastImpl, StatusFlag> { - static absl::StatusOr Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + StatusFlag flag) { DCHECK(!flag.ok()); return absl::CancelledError(); } @@ -135,7 +189,8 @@ struct FailureStatusCastImpl, StatusFlag> { template struct FailureStatusCastImpl, StatusFlag&> { - static absl::StatusOr Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + StatusFlag flag) { DCHECK(!flag.ok()); return absl::CancelledError(); } @@ -143,7 +198,8 @@ struct FailureStatusCastImpl, StatusFlag&> { template struct FailureStatusCastImpl, const StatusFlag&> { - static absl::StatusOr Cast(StatusFlag flag) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + StatusFlag flag) { DCHECK(!flag.ok()); return absl::CancelledError(); } @@ -160,49 +216,90 @@ class ValueOrFailure { // NOLINTNEXTLINE(google-explicit-constructor) ValueOrFailure(StatusFlag status) { CHECK(!status.ok()); } - static ValueOrFailure FromOptional(absl::optional value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static ValueOrFailure FromOptional( + absl::optional value) { return ValueOrFailure{std::move(value)}; } - bool ok() const { return value_.has_value(); } - StatusFlag status() const { return StatusFlag(ok()); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool ok() const { + return value_.has_value(); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION StatusFlag status() const { + return StatusFlag(ok()); + } - const T& value() const { return value_.value(); } - T& value() { return value_.value(); } - const T& operator*() const { return *value_; } - T& operator*() { return *value_; } - const T* operator->() const { return &*value_; } - T* operator->() { return &*value_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T& value() const { + return value_.value(); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T& value() { return value_.value(); } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T& operator*() const { + return *value_; + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T& operator*() { return *value_; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION const T* operator->() const { + return &*value_; + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* operator->() { return &*value_; } - bool operator==(const ValueOrFailure& other) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator==( + const ValueOrFailure& other) const { return value_ == other.value_; } - bool operator!=(const ValueOrFailure& other) const { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator!=( + const ValueOrFailure& other) const { return value_ != other.value_; } - bool operator==(const T& other) const { return value_ == other; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator==(const T& other) const { + return value_ == other; + } - bool operator!=(const T& other) const { return value_ != other; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool operator!=(const T& other) const { + return value_ != other; + } + + template + friend void AbslStringify(Sink& sink, const ValueOrFailure& value) { + if (value.ok()) { + sink.Append("Success("); + sink.Append(absl::StrCat(*value)); + sink.Append(")"); + } else { + sink.Append("Failure"); + } + } private: absl::optional value_; }; template -inline bool IsStatusOk(const ValueOrFailure& value) { +inline std::ostream& operator<<(std::ostream& os, + const ValueOrFailure& value) { + if (value.ok()) { + return os << "Success(" << *value << ")"; + } else { + return os << "Failure"; + } +} + +template +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool IsStatusOk( + const ValueOrFailure& value) { return value.ok(); } template -inline T TakeValue(ValueOrFailure&& value) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline T TakeValue( + ValueOrFailure&& value) { return std::move(value.value()); } template struct StatusCastImpl, ValueOrFailure> { - static absl::StatusOr Cast(ValueOrFailure value) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static absl::StatusOr Cast( + ValueOrFailure value) { return value.ok() ? absl::StatusOr(std::move(value.value())) : absl::CancelledError(); } @@ -210,14 +307,15 @@ struct StatusCastImpl, ValueOrFailure> { template struct StatusCastImpl, Failure> { - static ValueOrFailure Cast(Failure) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static ValueOrFailure Cast(Failure) { return ValueOrFailure(Failure{}); } }; template struct StatusCastImpl, StatusFlag&> { - static ValueOrFailure Cast(StatusFlag f) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static ValueOrFailure Cast( + StatusFlag f) { CHECK(!f.ok()); return ValueOrFailure(Failure{}); } @@ -225,7 +323,8 @@ struct StatusCastImpl, StatusFlag&> { template struct StatusCastImpl, StatusFlag> { - static ValueOrFailure Cast(StatusFlag f) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static ValueOrFailure Cast( + StatusFlag f) { CHECK(!f.ok()); return ValueOrFailure(Failure{}); } @@ -233,4 +332,4 @@ struct StatusCastImpl, StatusFlag> { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H \ No newline at end of file +#endif // GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H diff --git a/src/core/lib/promise/try_join.h b/src/core/lib/promise/try_join.h index 77b0496792..5cde944fe4 100644 --- a/src/core/lib/promise/try_join.h +++ b/src/core/lib/promise/try_join.h @@ -51,44 +51,56 @@ struct TryJoinTraits { template using ResultType = Result>; template - static bool IsOk(const absl::StatusOr& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk( + const absl::StatusOr& x) { + return x.ok(); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(const absl::Status& x) { + return x.ok(); + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk(StatusFlag x) { return x.ok(); } - static bool IsOk(const absl::Status& x) { return x.ok(); } - static bool IsOk(StatusFlag x) { return x.ok(); } template - static bool IsOk(const ValueOrFailure& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static bool IsOk( + const ValueOrFailure& x) { return x.ok(); } template - static T Unwrapped(absl::StatusOr x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T Unwrapped(absl::StatusOr x) { return std::move(*x); } template - static T Unwrapped(ValueOrFailure x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static T Unwrapped(ValueOrFailure x) { return std::move(*x); } - static Empty Unwrapped(absl::Status) { return Empty{}; } - static Empty Unwrapped(StatusFlag) { return Empty{}; } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Empty Unwrapped(absl::Status) { + return Empty{}; + } + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static Empty Unwrapped(StatusFlag) { + return Empty{}; + } template - static R EarlyReturn(absl::StatusOr x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn( + absl::StatusOr x) { return x.status(); } template - static R EarlyReturn(absl::Status x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn(absl::Status x) { return FailureStatusCast(std::move(x)); } template - static R EarlyReturn(StatusFlag x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn(StatusFlag x) { return FailureStatusCast(x); } template - static R EarlyReturn(const ValueOrFailure& x) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static R EarlyReturn( + const ValueOrFailure& x) { CHECK(!x.ok()); return FailureStatusCast(Failure{}); } template - static auto FinalReturn(A&&... a) { + GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION static auto FinalReturn(A&&... a) { return Result>(std::make_tuple(std::forward(a)...)); } }; @@ -97,8 +109,11 @@ struct TryJoinTraits { template