diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 786cb4bd24..a4c2d150be 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.68.0-dev' + version = '1.70.0-dev' s.version = version s.summary = 'gRPC C++ library' s.homepage = 'https://grpc.io' @@ -34,9 +34,9 @@ Pod::Spec.new do |s| :tag => "v#{version}", } - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' @@ -52,7 +52,8 @@ Pod::Spec.new do |s| s.header_dir = name s.pod_target_xcconfig = { - 'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"', + 'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"'\ + ' "$(PODS_TARGET_SRCROOT)/third_party/address_sorting/include"', 'USER_HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"'\ ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-gen"'\ ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-gen"'\ @@ -97,7 +98,6 @@ Pod::Spec.new do |s| 'include/grpcpp/client_context.h', 'include/grpcpp/completion_queue.h', 'include/grpcpp/create_channel.h', - 'include/grpcpp/create_channel_binder.h', 'include/grpcpp/create_channel_posix.h', 'include/grpcpp/ext/call_metric_recorder.h', 'include/grpcpp/ext/health_check_service_server_builder_option.h', @@ -162,6 +162,7 @@ Pod::Spec.new do |s| 'include/grpcpp/impl/completion_queue_tag.h', 'include/grpcpp/impl/create_auth_context.h', 'include/grpcpp/impl/delegating_channel.h', + 'include/grpcpp/impl/generic_serialize.h', 'include/grpcpp/impl/generic_stub_internal.h', 'include/grpcpp/impl/grpc_library.h', 'include/grpcpp/impl/intercepted_channel.h', @@ -185,8 +186,6 @@ Pod::Spec.new do |s| 'include/grpcpp/security/auth_context.h', 'include/grpcpp/security/auth_metadata_processor.h', 'include/grpcpp/security/authorization_policy_provider.h', - 'include/grpcpp/security/binder_credentials.h', - 'include/grpcpp/security/binder_security_policy.h', 'include/grpcpp/security/credentials.h', 'include/grpcpp/security/server_credentials.h', 'include/grpcpp/security/tls_certificate_provider.h', @@ -271,11 +270,13 @@ Pod::Spec.new do |s| ss.dependency 'abseil/types/variant', abseil_version ss.dependency 'abseil/utility/utility', abseil_version - ss.source_files = 'src/core/channelz/channel_trace.h', + ss.source_files = 'src/core/call/request_buffer.h', + 'src/core/channelz/channel_trace.h', 'src/core/channelz/channelz.h', 'src/core/channelz/channelz_registry.h', 'src/core/client_channel/backup_poller.h', 'src/core/client_channel/client_channel.h', + 'src/core/client_channel/client_channel_args.h', 'src/core/client_channel/client_channel_factory.h', 'src/core/client_channel/client_channel_filter.h', 'src/core/client_channel/client_channel_internal.h', @@ -290,12 +291,16 @@ Pod::Spec.new do |s| 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', 'src/core/client_channel/retry_filter_legacy_call_data.h', + 'src/core/client_channel/retry_interceptor.h', 'src/core/client_channel/retry_service_config.h', 'src/core/client_channel/retry_throttle.h', 'src/core/client_channel/subchannel.h', 'src/core/client_channel/subchannel_interface_internal.h', 'src/core/client_channel/subchannel_pool_interface.h', 'src/core/client_channel/subchannel_stream_client.h', + 'src/core/config/config_vars.h', + 'src/core/config/core_configuration.h', + 'src/core/config/load_config.h', 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h', 'src/core/ext/filters/channel_idle/idle_filter_state.h', @@ -313,44 +318,6 @@ Pod::Spec.new do |s| 'src/core/ext/filters/rbac/rbac_service_config_parser.h', 'src/core/ext/filters/stateful_session/stateful_session_filter.h', 'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h', - 'src/core/ext/transport/binder/client/binder_connector.cc', - 'src/core/ext/transport/binder/client/binder_connector.h', - 'src/core/ext/transport/binder/client/channel_create.cc', - 'src/core/ext/transport/binder/client/channel_create_impl.cc', - 'src/core/ext/transport/binder/client/channel_create_impl.h', - 'src/core/ext/transport/binder/client/connection_id_generator.cc', - 'src/core/ext/transport/binder/client/connection_id_generator.h', - 'src/core/ext/transport/binder/client/endpoint_binder_pool.cc', - 'src/core/ext/transport/binder/client/endpoint_binder_pool.h', - 'src/core/ext/transport/binder/client/jni_utils.cc', - 'src/core/ext/transport/binder/client/jni_utils.h', - 'src/core/ext/transport/binder/client/security_policy_setting.cc', - 'src/core/ext/transport/binder/client/security_policy_setting.h', - 'src/core/ext/transport/binder/security_policy/binder_security_policy.cc', - 'src/core/ext/transport/binder/server/binder_server.cc', - 'src/core/ext/transport/binder/server/binder_server.h', - 'src/core/ext/transport/binder/server/binder_server_credentials.cc', - 'src/core/ext/transport/binder/transport/binder_stream.h', - 'src/core/ext/transport/binder/transport/binder_transport.cc', - 'src/core/ext/transport/binder/transport/binder_transport.h', - 'src/core/ext/transport/binder/utils/binder_auto_utils.h', - 'src/core/ext/transport/binder/utils/ndk_binder.cc', - 'src/core/ext/transport/binder/utils/ndk_binder.h', - 'src/core/ext/transport/binder/utils/transport_stream_receiver.h', - 'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc', - 'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h', - 'src/core/ext/transport/binder/wire_format/binder.h', - 'src/core/ext/transport/binder/wire_format/binder_android.cc', - 'src/core/ext/transport/binder/wire_format/binder_android.h', - 'src/core/ext/transport/binder/wire_format/binder_constants.cc', - 'src/core/ext/transport/binder/wire_format/binder_constants.h', - 'src/core/ext/transport/binder/wire_format/transaction.cc', - 'src/core/ext/transport/binder/wire_format/transaction.h', - 'src/core/ext/transport/binder/wire_format/wire_reader.h', - 'src/core/ext/transport/binder/wire_format/wire_reader_impl.cc', - 'src/core/ext/transport/binder/wire_format/wire_reader_impl.h', - 'src/core/ext/transport/binder/wire_format/wire_writer.cc', - 'src/core/ext/transport/binder/wire_format/wire_writer.h', 'src/core/ext/transport/chttp2/alpn/alpn.h', 'src/core/ext/transport/chttp2/client/chttp2_connector.h', 'src/core/ext/transport/chttp2/server/chttp2_server.h', @@ -366,6 +333,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/frame_goaway.h', 'src/core/ext/transport/chttp2/transport/frame_ping.h', 'src/core/ext/transport/chttp2/transport/frame_rst_stream.h', + 'src/core/ext/transport/chttp2/transport/frame_security.h', 'src/core/ext/transport/chttp2/transport/frame_settings.h', 'src/core/ext/transport/chttp2/transport/frame_window_update.h', 'src/core/ext/transport/chttp2/transport/hpack_constants.h', @@ -544,6 +512,8 @@ Pod::Spec.new do |s| 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h', 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h', @@ -792,6 +762,7 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h', + 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h', @@ -872,12 +843,14 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h', 'src/core/filter/blackboard.h', + 'src/core/filter/filter_args.h', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h', 'src/core/handshaker/handshaker.h', 'src/core/handshaker/handshaker_factory.h', 'src/core/handshaker/handshaker_registry.h', 'src/core/handshaker/http_connect/http_connect_handshaker.h', 'src/core/handshaker/http_connect/http_proxy_mapper.h', + 'src/core/handshaker/http_connect/xds_http_proxy_mapper.h', 'src/core/handshaker/proxy_mapper.h', 'src/core/handshaker/proxy_mapper_registry.h', 'src/core/handshaker/security/secure_endpoint.h', @@ -897,9 +870,6 @@ Pod::Spec.new do |s| 'src/core/lib/channel/status_util.h', 'src/core/lib/compression/compression_internal.h', 'src/core/lib/compression/message_compress.h', - 'src/core/lib/config/config_vars.h', - 'src/core/lib/config/core_configuration.h', - 'src/core/lib/config/load_config.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -1142,6 +1112,7 @@ Pod::Spec.new do |s| 'src/core/lib/surface/client_call.h', 'src/core/lib/surface/completion_queue.h', 'src/core/lib/surface/completion_queue_factory.h', + 'src/core/lib/surface/connection_context.h', 'src/core/lib/surface/event_string.h', 'src/core/lib/surface/filter_stack_call.h', 'src/core/lib/surface/init.h', @@ -1172,6 +1143,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/status_conversion.h', 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', + 'src/core/lib/transport/transport_framing_endpoint_extension.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', @@ -1445,6 +1417,8 @@ Pod::Spec.new do |s| 'src/cpp/util/status.cc', 'src/cpp/util/string_ref.cc', 'src/cpp/util/time_cc.cc', + 'third_party/address_sorting/address_sorting_internal.h', + 'third_party/address_sorting/include/address_sorting/address_sorting.h', 'third_party/re2/re2/bitmap256.h', 'third_party/re2/re2/filtered_re2.h', 'third_party/re2/re2/pod_array.h', @@ -1539,6 +1513,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/def.hpp', 'third_party/upb/upb/reflection/def_pool.h', 'third_party/upb/upb/reflection/def_type.h', + 'third_party/upb/upb/reflection/descriptor_bootstrap.h', 'third_party/upb/upb/reflection/enum_def.h', 'third_party/upb/upb/reflection/enum_reserved_range.h', 'third_party/upb/upb/reflection/enum_value_def.h', @@ -1594,11 +1569,13 @@ Pod::Spec.new do |s| 'third_party/zlib/zlib.h', 'third_party/zlib/zutil.h' - ss.private_header_files = 'src/core/channelz/channel_trace.h', + ss.private_header_files = 'src/core/call/request_buffer.h', + 'src/core/channelz/channel_trace.h', 'src/core/channelz/channelz.h', 'src/core/channelz/channelz_registry.h', 'src/core/client_channel/backup_poller.h', 'src/core/client_channel/client_channel.h', + 'src/core/client_channel/client_channel_args.h', 'src/core/client_channel/client_channel_factory.h', 'src/core/client_channel/client_channel_filter.h', 'src/core/client_channel/client_channel_internal.h', @@ -1613,12 +1590,16 @@ Pod::Spec.new do |s| 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', 'src/core/client_channel/retry_filter_legacy_call_data.h', + 'src/core/client_channel/retry_interceptor.h', 'src/core/client_channel/retry_service_config.h', 'src/core/client_channel/retry_throttle.h', 'src/core/client_channel/subchannel.h', 'src/core/client_channel/subchannel_interface_internal.h', 'src/core/client_channel/subchannel_pool_interface.h', 'src/core/client_channel/subchannel_stream_client.h', + 'src/core/config/config_vars.h', + 'src/core/config/core_configuration.h', + 'src/core/config/load_config.h', 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h', 'src/core/ext/filters/channel_idle/idle_filter_state.h', @@ -1636,26 +1617,6 @@ Pod::Spec.new do |s| 'src/core/ext/filters/rbac/rbac_service_config_parser.h', 'src/core/ext/filters/stateful_session/stateful_session_filter.h', 'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h', - 'src/core/ext/transport/binder/client/binder_connector.h', - 'src/core/ext/transport/binder/client/channel_create_impl.h', - 'src/core/ext/transport/binder/client/connection_id_generator.h', - 'src/core/ext/transport/binder/client/endpoint_binder_pool.h', - 'src/core/ext/transport/binder/client/jni_utils.h', - 'src/core/ext/transport/binder/client/security_policy_setting.h', - 'src/core/ext/transport/binder/server/binder_server.h', - 'src/core/ext/transport/binder/transport/binder_stream.h', - 'src/core/ext/transport/binder/transport/binder_transport.h', - 'src/core/ext/transport/binder/utils/binder_auto_utils.h', - 'src/core/ext/transport/binder/utils/ndk_binder.h', - 'src/core/ext/transport/binder/utils/transport_stream_receiver.h', - 'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h', - 'src/core/ext/transport/binder/wire_format/binder.h', - 'src/core/ext/transport/binder/wire_format/binder_android.h', - 'src/core/ext/transport/binder/wire_format/binder_constants.h', - 'src/core/ext/transport/binder/wire_format/transaction.h', - 'src/core/ext/transport/binder/wire_format/wire_reader.h', - 'src/core/ext/transport/binder/wire_format/wire_reader_impl.h', - 'src/core/ext/transport/binder/wire_format/wire_writer.h', 'src/core/ext/transport/chttp2/alpn/alpn.h', 'src/core/ext/transport/chttp2/client/chttp2_connector.h', 'src/core/ext/transport/chttp2/server/chttp2_server.h', @@ -1671,6 +1632,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/frame_goaway.h', 'src/core/ext/transport/chttp2/transport/frame_ping.h', 'src/core/ext/transport/chttp2/transport/frame_rst_stream.h', + 'src/core/ext/transport/chttp2/transport/frame_security.h', 'src/core/ext/transport/chttp2/transport/frame_settings.h', 'src/core/ext/transport/chttp2/transport/frame_window_update.h', 'src/core/ext/transport/chttp2/transport/hpack_constants.h', @@ -1849,6 +1811,8 @@ Pod::Spec.new do |s| 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h', 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h', @@ -2097,6 +2061,7 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h', + 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h', @@ -2177,12 +2142,14 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h', 'src/core/filter/blackboard.h', + 'src/core/filter/filter_args.h', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h', 'src/core/handshaker/handshaker.h', 'src/core/handshaker/handshaker_factory.h', 'src/core/handshaker/handshaker_registry.h', 'src/core/handshaker/http_connect/http_connect_handshaker.h', 'src/core/handshaker/http_connect/http_proxy_mapper.h', + 'src/core/handshaker/http_connect/xds_http_proxy_mapper.h', 'src/core/handshaker/proxy_mapper.h', 'src/core/handshaker/proxy_mapper_registry.h', 'src/core/handshaker/security/secure_endpoint.h', @@ -2202,9 +2169,6 @@ Pod::Spec.new do |s| 'src/core/lib/channel/status_util.h', 'src/core/lib/compression/compression_internal.h', 'src/core/lib/compression/message_compress.h', - 'src/core/lib/config/config_vars.h', - 'src/core/lib/config/core_configuration.h', - 'src/core/lib/config/load_config.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -2447,6 +2411,7 @@ Pod::Spec.new do |s| 'src/core/lib/surface/client_call.h', 'src/core/lib/surface/completion_queue.h', 'src/core/lib/surface/completion_queue_factory.h', + 'src/core/lib/surface/connection_context.h', 'src/core/lib/surface/event_string.h', 'src/core/lib/surface/filter_stack_call.h', 'src/core/lib/surface/init.h', @@ -2477,6 +2442,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/status_conversion.h', 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', + 'src/core/lib/transport/transport_framing_endpoint_extension.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', @@ -2700,6 +2666,8 @@ Pod::Spec.new do |s| 'src/cpp/server/secure_server_credentials.h', 'src/cpp/server/thread_pool_interface.h', 'src/cpp/thread_manager/thread_manager.h', + 'third_party/address_sorting/address_sorting_internal.h', + 'third_party/address_sorting/include/address_sorting/address_sorting.h', 'third_party/re2/re2/bitmap256.h', 'third_party/re2/re2/filtered_re2.h', 'third_party/re2/re2/pod_array.h', @@ -2794,6 +2762,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/def.hpp', 'third_party/upb/upb/reflection/def_pool.h', 'third_party/upb/upb/reflection/def_type.h', + 'third_party/upb/upb/reflection/descriptor_bootstrap.h', 'third_party/upb/upb/reflection/enum_def.h', 'third_party/upb/upb/reflection/enum_reserved_range.h', 'third_party/upb/upb/reflection/enum_value_def.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index cc9c1a2a97..d24596625c 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.68.0-dev' + version = '1.70.0-dev' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' @@ -38,9 +38,9 @@ Pod::Spec.new do |s| # which was released in Cocoapods v1.2.0. s.cocoapods_version = '>= 1.2.0' - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' @@ -73,7 +73,8 @@ Pod::Spec.new do |s| # root of the repo, third_party/** and two upb generated directories, and the system headers # search path (angled includes) to point to `include/`. s.pod_target_xcconfig = { - 'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"', + 'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(PODS_TARGET_SRCROOT)/include"'\ + ' "$(PODS_TARGET_SRCROOT)/third_party/address_sorting/include"', 'USER_HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)"'\ ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upb-gen"'\ ' "$(PODS_TARGET_SRCROOT)/src/core/ext/upbdefs-gen"'\ @@ -238,7 +239,9 @@ Pod::Spec.new do |s| ss.dependency 'abseil/utility/utility', abseil_version ss.compiler_flags = '-DBORINGSSL_PREFIX=GRPC -Wno-unreachable-code -Wno-shorten-64-to-32' - ss.source_files = 'src/core/channelz/channel_trace.cc', + ss.source_files = 'src/core/call/request_buffer.cc', + 'src/core/call/request_buffer.h', + 'src/core/channelz/channel_trace.cc', 'src/core/channelz/channel_trace.h', 'src/core/channelz/channelz.cc', 'src/core/channelz/channelz.h', @@ -248,6 +251,7 @@ Pod::Spec.new do |s| 'src/core/client_channel/backup_poller.h', 'src/core/client_channel/client_channel.cc', 'src/core/client_channel/client_channel.h', + 'src/core/client_channel/client_channel_args.h', 'src/core/client_channel/client_channel_factory.cc', 'src/core/client_channel/client_channel_factory.h', 'src/core/client_channel/client_channel_filter.cc', @@ -274,6 +278,8 @@ Pod::Spec.new do |s| 'src/core/client_channel/retry_filter.h', 'src/core/client_channel/retry_filter_legacy_call_data.cc', 'src/core/client_channel/retry_filter_legacy_call_data.h', + 'src/core/client_channel/retry_interceptor.cc', + 'src/core/client_channel/retry_interceptor.h', 'src/core/client_channel/retry_service_config.cc', 'src/core/client_channel/retry_service_config.h', 'src/core/client_channel/retry_throttle.cc', @@ -285,6 +291,13 @@ Pod::Spec.new do |s| 'src/core/client_channel/subchannel_pool_interface.h', 'src/core/client_channel/subchannel_stream_client.cc', 'src/core/client_channel/subchannel_stream_client.h', + 'src/core/config/config_vars.cc', + 'src/core/config/config_vars.h', + 'src/core/config/config_vars_non_generated.cc', + 'src/core/config/core_configuration.cc', + 'src/core/config/core_configuration.h', + 'src/core/config/load_config.cc', + 'src/core/config/load_config.h', 'src/core/ext/filters/backend_metrics/backend_metric_filter.cc', 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h', @@ -349,6 +362,8 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/frame_ping.h', 'src/core/ext/transport/chttp2/transport/frame_rst_stream.cc', 'src/core/ext/transport/chttp2/transport/frame_rst_stream.h', + 'src/core/ext/transport/chttp2/transport/frame_security.cc', + 'src/core/ext/transport/chttp2/transport/frame_security.h', 'src/core/ext/transport/chttp2/transport/frame_settings.cc', 'src/core/ext/transport/chttp2/transport/frame_settings.h', 'src/core/ext/transport/chttp2/transport/frame_window_update.cc', @@ -625,6 +640,9 @@ Pod::Spec.new do |s| 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h', 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c', 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h', @@ -1034,6 +1052,8 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c', 'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h', + 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c', + 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c', @@ -1194,6 +1214,7 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h', 'src/core/filter/blackboard.cc', 'src/core/filter/blackboard.h', + 'src/core/filter/filter_args.h', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h', 'src/core/handshaker/handshaker.cc', @@ -1205,6 +1226,8 @@ Pod::Spec.new do |s| 'src/core/handshaker/http_connect/http_connect_handshaker.h', 'src/core/handshaker/http_connect/http_proxy_mapper.cc', 'src/core/handshaker/http_connect/http_proxy_mapper.h', + 'src/core/handshaker/http_connect/xds_http_proxy_mapper.cc', + 'src/core/handshaker/http_connect/xds_http_proxy_mapper.h', 'src/core/handshaker/proxy_mapper.h', 'src/core/handshaker/proxy_mapper_registry.cc', 'src/core/handshaker/proxy_mapper_registry.h', @@ -1241,13 +1264,6 @@ Pod::Spec.new do |s| 'src/core/lib/compression/compression_internal.h', 'src/core/lib/compression/message_compress.cc', 'src/core/lib/compression/message_compress.h', - 'src/core/lib/config/config_vars.cc', - 'src/core/lib/config/config_vars.h', - 'src/core/lib/config/config_vars_non_generated.cc', - 'src/core/lib/config/core_configuration.cc', - 'src/core/lib/config/core_configuration.h', - 'src/core/lib/config/load_config.cc', - 'src/core/lib/config/load_config.h', 'src/core/lib/debug/trace.cc', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.cc', @@ -1703,6 +1719,8 @@ Pod::Spec.new do |s| 'src/core/lib/surface/completion_queue.h', 'src/core/lib/surface/completion_queue_factory.cc', 'src/core/lib/surface/completion_queue_factory.h', + 'src/core/lib/surface/connection_context.cc', + 'src/core/lib/surface/connection_context.h', 'src/core/lib/surface/event_string.cc', 'src/core/lib/surface/event_string.h', 'src/core/lib/surface/filter_stack_call.cc', @@ -1760,6 +1778,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.cc', 'src/core/lib/transport/transport.h', + 'src/core/lib/transport/transport_framing_endpoint_extension.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/lib/transport/transport_op_string.cc', 'src/core/load_balancing/address_filtering.cc', @@ -1818,7 +1837,6 @@ Pod::Spec.new do |s| 'src/core/load_balancing/xds/xds_wrr_locality.cc', 'src/core/plugin_registry/grpc_plugin_registry.cc', 'src/core/plugin_registry/grpc_plugin_registry_extra.cc', - 'src/core/resolver/binder/binder_resolver.cc', 'src/core/resolver/dns/c_ares/dns_resolver_ares.cc', 'src/core/resolver/dns/c_ares/dns_resolver_ares.h', 'src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h', @@ -2168,6 +2186,11 @@ Pod::Spec.new do |s| 'src/core/xds/xds_client/xds_resource_type.h', 'src/core/xds/xds_client/xds_resource_type_impl.h', 'src/core/xds/xds_client/xds_transport.h', + 'third_party/address_sorting/address_sorting.c', + 'third_party/address_sorting/address_sorting_internal.h', + 'third_party/address_sorting/address_sorting_posix.c', + 'third_party/address_sorting/address_sorting_windows.c', + 'third_party/address_sorting/include/address_sorting/address_sorting.h', 'third_party/re2/re2/bitmap256.h', 'third_party/re2/re2/bitstate.cc', 'third_party/re2/re2/compile.cc', @@ -2316,6 +2339,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/def_type.c', 'third_party/upb/upb/reflection/def_type.h', 'third_party/upb/upb/reflection/desc_state.c', + 'third_party/upb/upb/reflection/descriptor_bootstrap.h', 'third_party/upb/upb/reflection/enum_def.c', 'third_party/upb/upb/reflection/enum_def.h', 'third_party/upb/upb/reflection/enum_reserved_range.c', @@ -2403,11 +2427,13 @@ Pod::Spec.new do |s| 'third_party/zlib/zlib.h', 'third_party/zlib/zutil.c', 'third_party/zlib/zutil.h' - ss.private_header_files = 'src/core/channelz/channel_trace.h', + ss.private_header_files = 'src/core/call/request_buffer.h', + 'src/core/channelz/channel_trace.h', 'src/core/channelz/channelz.h', 'src/core/channelz/channelz_registry.h', 'src/core/client_channel/backup_poller.h', 'src/core/client_channel/client_channel.h', + 'src/core/client_channel/client_channel_args.h', 'src/core/client_channel/client_channel_factory.h', 'src/core/client_channel/client_channel_filter.h', 'src/core/client_channel/client_channel_internal.h', @@ -2422,12 +2448,16 @@ Pod::Spec.new do |s| 'src/core/client_channel/local_subchannel_pool.h', 'src/core/client_channel/retry_filter.h', 'src/core/client_channel/retry_filter_legacy_call_data.h', + 'src/core/client_channel/retry_interceptor.h', 'src/core/client_channel/retry_service_config.h', 'src/core/client_channel/retry_throttle.h', 'src/core/client_channel/subchannel.h', 'src/core/client_channel/subchannel_interface_internal.h', 'src/core/client_channel/subchannel_pool_interface.h', 'src/core/client_channel/subchannel_stream_client.h', + 'src/core/config/config_vars.h', + 'src/core/config/core_configuration.h', + 'src/core/config/load_config.h', 'src/core/ext/filters/backend_metrics/backend_metric_filter.h', 'src/core/ext/filters/backend_metrics/backend_metric_provider.h', 'src/core/ext/filters/channel_idle/idle_filter_state.h', @@ -2460,6 +2490,7 @@ Pod::Spec.new do |s| 'src/core/ext/transport/chttp2/transport/frame_goaway.h', 'src/core/ext/transport/chttp2/transport/frame_ping.h', 'src/core/ext/transport/chttp2/transport/frame_rst_stream.h', + 'src/core/ext/transport/chttp2/transport/frame_security.h', 'src/core/ext/transport/chttp2/transport/frame_settings.h', 'src/core/ext/transport/chttp2/transport/frame_window_update.h', 'src/core/ext/transport/chttp2/transport/hpack_constants.h', @@ -2638,6 +2669,8 @@ Pod::Spec.new do |s| 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h', 'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h', + 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h', 'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h', @@ -2886,6 +2919,7 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h', + 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h', 'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h', @@ -2966,12 +3000,14 @@ Pod::Spec.new do |s| 'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h', 'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h', 'src/core/filter/blackboard.h', + 'src/core/filter/filter_args.h', 'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h', 'src/core/handshaker/handshaker.h', 'src/core/handshaker/handshaker_factory.h', 'src/core/handshaker/handshaker_registry.h', 'src/core/handshaker/http_connect/http_connect_handshaker.h', 'src/core/handshaker/http_connect/http_proxy_mapper.h', + 'src/core/handshaker/http_connect/xds_http_proxy_mapper.h', 'src/core/handshaker/proxy_mapper.h', 'src/core/handshaker/proxy_mapper_registry.h', 'src/core/handshaker/security/secure_endpoint.h', @@ -2991,9 +3027,6 @@ Pod::Spec.new do |s| 'src/core/lib/channel/status_util.h', 'src/core/lib/compression/compression_internal.h', 'src/core/lib/compression/message_compress.h', - 'src/core/lib/config/config_vars.h', - 'src/core/lib/config/core_configuration.h', - 'src/core/lib/config/load_config.h', 'src/core/lib/debug/trace.h', 'src/core/lib/debug/trace_flags.h', 'src/core/lib/debug/trace_impl.h', @@ -3236,6 +3269,7 @@ Pod::Spec.new do |s| 'src/core/lib/surface/client_call.h', 'src/core/lib/surface/completion_queue.h', 'src/core/lib/surface/completion_queue_factory.h', + 'src/core/lib/surface/connection_context.h', 'src/core/lib/surface/event_string.h', 'src/core/lib/surface/filter_stack_call.h', 'src/core/lib/surface/init.h', @@ -3266,6 +3300,7 @@ Pod::Spec.new do |s| 'src/core/lib/transport/status_conversion.h', 'src/core/lib/transport/timeout_encoding.h', 'src/core/lib/transport/transport.h', + 'src/core/lib/transport/transport_framing_endpoint_extension.h', 'src/core/lib/transport/transport_fwd.h', 'src/core/load_balancing/address_filtering.h', 'src/core/load_balancing/backend_metric_data.h', @@ -3477,6 +3512,8 @@ Pod::Spec.new do |s| 'src/core/xds/xds_client/xds_resource_type.h', 'src/core/xds/xds_client/xds_resource_type_impl.h', 'src/core/xds/xds_client/xds_transport.h', + 'third_party/address_sorting/address_sorting_internal.h', + 'third_party/address_sorting/include/address_sorting/address_sorting.h', 'third_party/re2/re2/bitmap256.h', 'third_party/re2/re2/filtered_re2.h', 'third_party/re2/re2/pod_array.h', @@ -3571,6 +3608,7 @@ Pod::Spec.new do |s| 'third_party/upb/upb/reflection/def.hpp', 'third_party/upb/upb/reflection/def_pool.h', 'third_party/upb/upb/reflection/def_type.h', + 'third_party/upb/upb/reflection/descriptor_bootstrap.h', 'third_party/upb/upb/reflection/enum_def.h', 'third_party/upb/upb/reflection/enum_reserved_range.h', 'third_party/upb/upb/reflection/enum_value_def.h', diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index 291a494cd2..9f83832e42 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.68.0-dev' + version = '1.70.0-dev' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' @@ -33,9 +33,9 @@ Pod::Spec.new do |s| :tag => "v#{version}", } - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index b79eacfc79..ae6c77f299 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.68.0-dev' + version = '1.70.0-dev' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' @@ -33,9 +33,9 @@ Pod::Spec.new do |s| :tag => "v#{version}", } - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' diff --git a/gRPC.podspec b/gRPC.podspec index 2db370d71f..7c44ecd851 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.68.0-dev' + version = '1.70.0-dev' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' @@ -45,9 +45,9 @@ Pod::Spec.new do |s| 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14', } - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' @@ -80,9 +80,9 @@ Pod::Spec.new do |s| "src/objective-c/GRPCClient/GRPCTypes.mm" ss.dependency "gRPC-RxLibrary/Interface", version ss.dependency "#{s.name}/Privacy", version - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' end @@ -116,9 +116,9 @@ Pod::Spec.new do |s| ss.dependency "#{s.name}/Interface-Legacy", version ss.dependency "#{s.name}/Privacy", version - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' end @@ -154,9 +154,9 @@ Pod::Spec.new do |s| ss.dependency 'gRPC-Core', version ss.dependency 'gRPC-RxLibrary', version - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' end @@ -172,16 +172,16 @@ Pod::Spec.new do |s| ss.dependency 'gRPC-Core/Cronet-Implementation', version ss.dependency 'CronetFramework' - ss.ios.deployment_target = '10.0' + ss.ios.deployment_target = '11.0' end # CFStream is now default. Leaving this subspec only for compatibility purpose. s.subspec 'CFStream' do |ss| ss.dependency "#{s.name}/GRPCCore", version - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' end @@ -192,9 +192,9 @@ Pod::Spec.new do |s| ss.source_files = 'src/objective-c/GRPCClient/internal_testing/*.{h,mm}' ss.header_mappings_dir = 'src/objective-c/GRPCClient' - s.ios.deployment_target = '10.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '12.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.14' + s.tvos.deployment_target = '13.0' s.watchos.deployment_target = '6.0' s.visionos.deployment_target = '1.0' end diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h index 410c109dfc..6c329590fc 100644 --- a/include/grpc/event_engine/event_engine.h +++ b/include/grpc/event_engine/event_engine.h @@ -194,9 +194,12 @@ class EventEngine : public std::enable_shared_from_this, /// on_read callback is not executed. Otherwise it returns false and the \a /// on_read callback executes asynchronously when the read completes. The /// caller must ensure that the callback has access to the buffer when it - /// executes. Ownership of the buffer is not transferred. Valid slices *may* - /// be placed into the buffer even if the callback is invoked with a non-OK - /// Status. + /// executes. Ownership of the buffer is not transferred. Either an error is + /// passed to the callback (like socket closed), or valid data is available + /// in the buffer, but never both at the same time. Implementations that + /// receive valid data must not throw that data away - that is, if valid + /// data is received on the underlying endpoint, a callback will be made + /// with that data available and an ok status. /// /// There can be at most one outstanding read per Endpoint at any given /// time. An outstanding read is one in which the \a on_read callback has diff --git a/include/grpc/impl/channel_arg_names.h b/include/grpc/impl/channel_arg_names.h index aa973c2197..94361a9182 100644 --- a/include/grpc/impl/channel_arg_names.h +++ b/include/grpc/impl/channel_arg_names.h @@ -400,6 +400,8 @@ "grpc.max_allowed_incoming_connections" /** Configure per-channel or per-server stats plugins. */ #define GRPC_ARG_EXPERIMENTAL_STATS_PLUGINS "grpc.experimental.stats_plugins" +/** If non-zero, allow security frames to be sent and received. */ +#define GRPC_ARG_SECURITY_FRAME_ALLOWED "grpc.security_frame_allowed" /** \} */ #endif /* GRPC_IMPL_CHANNEL_ARG_NAMES_H */ diff --git a/include/grpc/support/metrics.h b/include/grpc/support/metrics.h index 6252575662..55d60d5de1 100644 --- a/include/grpc/support/metrics.h +++ b/include/grpc/support/metrics.h @@ -24,7 +24,11 @@ namespace grpc_core { namespace experimental { // Configuration (scope) for a specific client channel to be used for stats -// plugins. +// plugins. For some components like XdsClient where the same XdsClient instance +// can be shared across multiple channels that share the same target name but +// have different default authority and channel arguments, the component uses +// the configuration from the first channel that uses this XdsClient instance to +// determine StatsPluginChannelScope. class StatsPluginChannelScope { public: StatsPluginChannelScope( diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h index 5fb7426af2..04a79ef3c8 100644 --- a/include/grpc/support/port_platform.h +++ b/include/grpc/support/port_platform.h @@ -172,7 +172,6 @@ #if __ANDROID_API__ < 21 #error "Requires Android API v21 and above" #endif -#define GPR_SUPPORT_BINDER_TRANSPORT 1 // TODO(apolcyn): re-evaluate support for c-ares // on android after upgrading our c-ares dependency. // See https://github.com/grpc/grpc/issues/18038. @@ -195,6 +194,12 @@ #define GPR_HAS_PTHREAD_H 1 #define GPR_GETPID_IN_UNISTD_H 1 #define GPR_SUPPORT_CHANNELS_FROM_FD 1 +#if defined(__has_include) +#if __has_include() +#include +#endif /* __has_include() */ +#endif /* defined(__has_include) */ +#include #elif defined(__linux__) #define GPR_PLATFORM_STRING "linux" #ifndef _BSD_SOURCE diff --git a/include/grpcpp/create_channel_binder.h b/include/grpcpp/create_channel_binder.h deleted file mode 100644 index f19792a184..0000000000 --- a/include/grpcpp/create_channel_binder.h +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright 2021 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GRPCPP_CREATE_CHANNEL_BINDER_H -#define GRPCPP_CREATE_CHANNEL_BINDER_H - -#include - -#ifdef GPR_ANDROID - -#include -#include -#include -#include - -#include - -#include "absl/strings/string_view.h" - -namespace grpc { -namespace experimental { - -/// EXPERIMENTAL Create a new \a Channel based on binder transport. The package -/// name and class name will be used identify the specific application component -/// to connect to. -/// -/// \param jni_env_void Pointer to a JNIEnv structure -/// \param context The context that we will use to invoke \a bindService See -/// https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int) -/// for detail. -/// \param package_name Package name of the component to be connected to -/// \param class_name Class name of the component to be connected to -/// \param security_policy Used for checking if remote component is allowed to -/// connect -std::shared_ptr CreateBinderChannel( - void* jni_env_void, jobject context, absl::string_view package_name, - absl::string_view class_name, - std::shared_ptr - security_policy); - -/// EXPERIMENTAL Create a new \a Channel based on binder transport. The package -/// name and class name will be used identify the specific application component -/// to connect to. -/// -/// \param jni_env_void Pointer to a JNIEnv structure -/// \param context The context that we will use to invoke \a bindService See -/// https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int) -/// for detail. -/// \param package_name Package name of the component to be connected to -/// \param class_name Class name of the component to be connected to -/// \param security_policy Used for checking if remote component is allowed to -/// connect -/// \param args Options for channel creation. -std::shared_ptr CreateCustomBinderChannel( - void* jni_env_void, jobject context, absl::string_view package_name, - absl::string_view class_name, - std::shared_ptr security_policy, - const ChannelArguments& args); - -/// EXPERIMENTAL Create a new \a Channel based on binder transport. -/// -/// \param jni_env_void Pointer to a JNIEnv structure -/// \param context The context that we will use to invoke \a bindService See -/// https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int) -/// for detail. -/// \param uri An URI that can be parsed as an `Intent` with -/// https://developer.android.com/reference/android/content/Intent#parseUri(java.lang.String,%20int) -/// \param security_policy Used for checking if remote component is allowed to -/// connect -std::shared_ptr CreateBinderChannel( - void* jni_env_void, jobject context, absl::string_view uri, - std::shared_ptr - security_policy); - -/// EXPERIMENTAL Create a new \a Channel based on binder transport. -/// -/// \param jni_env_void Pointer to a JNIEnv structure -/// \param context The context that we will use to invoke \a bindService See -/// https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int) -/// for detail. -/// \param uri An URI that can be parsed as an `Intent` with -/// https://developer.android.com/reference/android/content/Intent#parseUri(java.lang.String,%20int) -/// \param security_policy Used for checking if remote component is allowed to -/// connect -/// \param args Options for channel creation. -std::shared_ptr CreateCustomBinderChannel( - void* jni_env_void, jobject context, absl::string_view uri, - std::shared_ptr security_policy, - const ChannelArguments& args); - -/// EXPERIMENTAL Finds internal binder transport Java code. To create channels -/// in threads created in native code, it is required to call this function -/// once beforehand in a thread that is not created in native code. -/// See -/// https://developer.android.com/training/articles/perf-jni#faq:-why-didnt-findclass-find-my-class -/// for details of this limitation. -/// Returns true when the initialization is successful. -bool InitializeBinderChannelJavaClass(void* jni_env_void); - -/// EXPERIMENTAL Alternative version of `InitializeBinderChannelJavaClass(void* -/// jni_env_void)`. This version used a user-specified function to find the -/// required internal Java class. When a class is found, the `class_finder` -/// function should return a local reference to the class (jclass type). The -/// returned jclass will then be used to create global reference for gRPC to use -/// it later. After that, gRPC will DeleteLocalRef the returned local reference. -bool InitializeBinderChannelJavaClass( - void* jni_env_void, std::function class_finder); - -} // namespace experimental -} // namespace grpc - -#endif - -#endif // GRPCPP_CREATE_CHANNEL_BINDER_H diff --git a/include/grpcpp/impl/codegen/config_protobuf.h b/include/grpcpp/impl/codegen/config_protobuf.h index b4095ff08f..ddf56aafdc 100644 --- a/include/grpcpp/impl/codegen/config_protobuf.h +++ b/include/grpcpp/impl/codegen/config_protobuf.h @@ -21,7 +21,7 @@ // IWYU pragma: private -#define GRPC_OPEN_SOURCE_PROTO +// #define GRPC_OPEN_SOURCE_PROTO #define GRPC_PROTOBUF_CORD_SUPPORT_ENABLED @@ -40,7 +40,7 @@ #ifndef GRPC_CUSTOM_DESCRIPTOR #include #include -#if GOOGLE_PROTOBUF_VERSION >= 4025000 +#if !defined(GOOGLE_PROTOBUF_VERSION) || GOOGLE_PROTOBUF_VERSION >= 4025000 #define GRPC_PROTOBUF_EDITION_SUPPORT #endif #define GRPC_CUSTOM_DESCRIPTOR ::google::protobuf::Descriptor diff --git a/include/grpcpp/impl/generic_serialize.h b/include/grpcpp/impl/generic_serialize.h new file mode 100644 index 0000000000..191b646504 --- /dev/null +++ b/include/grpcpp/impl/generic_serialize.h @@ -0,0 +1,93 @@ +// 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 GRPCPP_IMPL_GENERIC_SERIALIZE_H +#define GRPCPP_IMPL_GENERIC_SERIALIZE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "absl/log/absl_check.h" + +/// This header provides serialization and deserialization between gRPC +/// messages serialized using protobuf and the C++ objects they represent. + +namespace grpc { + +// ProtoBufferWriter must be a subclass of ::protobuf::io::ZeroCopyOutputStream. +template +Status GenericSerialize(const grpc::protobuf::MessageLite& msg, ByteBuffer* bb, + bool* own_buffer) { + static_assert(std::is_base_of::value, + "ProtoBufferWriter must be a subclass of " + "::protobuf::io::ZeroCopyOutputStream"); + *own_buffer = true; + int byte_size = static_cast(msg.ByteSizeLong()); + if (static_cast(byte_size) <= GRPC_SLICE_INLINED_SIZE) { + Slice slice(byte_size); + // We serialize directly into the allocated slices memory + ABSL_CHECK(slice.end() == msg.SerializeWithCachedSizesToArray( + const_cast(slice.begin()))); + ByteBuffer tmp(&slice, 1); + bb->Swap(&tmp); + + return grpc::Status::OK; + } + ProtoBufferWriter writer(bb, kProtoBufferWriterMaxBufferLength, byte_size); + protobuf::io::CodedOutputStream cs(&writer); + msg.SerializeWithCachedSizes(&cs); + return !cs.HadError() + ? grpc::Status::OK + : Status(StatusCode::INTERNAL, "Failed to serialize message"); +} + +// BufferReader must be a subclass of ::protobuf::io::ZeroCopyInputStream. +template +Status GenericDeserialize(ByteBuffer* buffer, + grpc::protobuf::MessageLite* msg) { + static_assert(std::is_base_of::value, + "ProtoBufferReader must be a subclass of " + "::protobuf::io::ZeroCopyInputStream"); + if (buffer == nullptr) { + return Status(StatusCode::INTERNAL, "No payload"); + } + Status result = grpc::Status::OK; + { + ProtoBufferReader reader(buffer); + if (!reader.status().ok()) { + return reader.status(); + } + if (!msg->ParseFromZeroCopyStream(&reader)) { + result = Status(StatusCode::INTERNAL, msg->InitializationErrorString()); + } + } + buffer->Clear(); + return result; +} + +} // namespace grpc + +#endif // GRPCPP_IMPL_GENERIC_SERIALIZE_H diff --git a/include/grpcpp/impl/proto_utils.h b/include/grpcpp/impl/proto_utils.h index 4a101ebe11..9a59296441 100644 --- a/include/grpcpp/impl/proto_utils.h +++ b/include/grpcpp/impl/proto_utils.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -32,69 +33,11 @@ #include -#include "absl/log/absl_check.h" - /// This header provides serialization and deserialization between gRPC /// messages serialized using protobuf and the C++ objects they represent. namespace grpc { -// ProtoBufferWriter must be a subclass of ::protobuf::io::ZeroCopyOutputStream. -template -Status GenericSerialize(const grpc::protobuf::MessageLite& msg, ByteBuffer* bb, - bool* own_buffer) { - static_assert(std::is_base_of::value, - "ProtoBufferWriter must be a subclass of " - "::protobuf::io::ZeroCopyOutputStream"); - *own_buffer = true; - int byte_size = static_cast(msg.ByteSizeLong()); - if (static_cast(byte_size) <= GRPC_SLICE_INLINED_SIZE) { - Slice slice(byte_size); - // We serialize directly into the allocated slices memory - ABSL_CHECK(slice.end() == msg.SerializeWithCachedSizesToArray( - const_cast(slice.begin()))); - ByteBuffer tmp(&slice, 1); - bb->Swap(&tmp); - - return grpc::Status::OK; - } - ProtoBufferWriter writer(bb, kProtoBufferWriterMaxBufferLength, byte_size); - protobuf::io::CodedOutputStream cs(&writer); - msg.SerializeWithCachedSizes(&cs); - return !cs.HadError() - ? grpc::Status::OK - : Status(StatusCode::INTERNAL, "Failed to serialize message"); -} - -// BufferReader must be a subclass of ::protobuf::io::ZeroCopyInputStream. -template -Status GenericDeserialize(ByteBuffer* buffer, - grpc::protobuf::MessageLite* msg) { - static_assert(std::is_base_of::value, - "ProtoBufferReader must be a subclass of " - "::protobuf::io::ZeroCopyInputStream"); - if (buffer == nullptr) { - return Status(StatusCode::INTERNAL, "No payload"); - } - Status result = grpc::Status::OK; - { - ProtoBufferReader reader(buffer); - if (!reader.status().ok()) { - return reader.status(); - } - if (!msg->ParseFromZeroCopyStream(&reader)) { - result = Status(StatusCode::INTERNAL, msg->InitializationErrorString()); - } - } - buffer->Clear(); - return result; -} - -// this is needed so the following class does not conflict with protobuf -// serializers that utilize internal-only tools. -#ifdef GRPC_OPEN_SOURCE_PROTO // This class provides a protobuf serializer. It translates between protobuf // objects and grpc_byte_buffers. More information about SerializationTraits can // be found in include/grpcpp/impl/codegen/serialization_traits.h. @@ -113,7 +56,6 @@ class SerializationTraits< return GenericDeserialize(buffer, msg); } }; -#endif } // namespace grpc diff --git a/include/grpcpp/security/binder_credentials.h b/include/grpcpp/security/binder_credentials.h deleted file mode 100644 index 3c38b5129d..0000000000 --- a/include/grpcpp/security/binder_credentials.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2021 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GRPCPP_SECURITY_BINDER_CREDENTIALS_H -#define GRPCPP_SECURITY_BINDER_CREDENTIALS_H - -#include -#include - -#include - -namespace grpc { - -class ChannelCredentials; - -namespace experimental { - -/// EXPERIMENTAL Builds Binder ServerCredentials. -/// -/// This should be used along with `binder:` URI scheme. The path in the URI can -/// later be used to access the server's endpoint binder. -/// Note that calling \a ServerBuilder::AddListeningPort() with Binder -/// ServerCredentials in a non-supported environment will make the subsequent -/// call to \a ServerBuilder::BuildAndStart() return a null pointer. -std::shared_ptr BinderServerCredentials( - std::shared_ptr - security_policy); - -} // namespace experimental -} // namespace grpc - -#endif // GRPCPP_SECURITY_BINDER_CREDENTIALS_H diff --git a/include/grpcpp/security/binder_security_policy.h b/include/grpcpp/security/binder_security_policy.h deleted file mode 100644 index e1c951fc66..0000000000 --- a/include/grpcpp/security/binder_security_policy.h +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2021 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H -#define GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H - -#include - -#ifdef GPR_ANDROID - -#include - -#endif - -namespace grpc { -namespace experimental { -namespace binder { - -// EXPERIMENTAL Determinines if a connection is allowed to be -// established on Android. See https://source.android.com/security/app-sandbox -// for more info about UID. -class SecurityPolicy { - public: - virtual ~SecurityPolicy() = default; - // Returns true if the UID is authorized to connect. - // Must return the same value for the same inputs so callers can safely cache - // the result. - virtual bool IsAuthorized(int uid) = 0; -}; - -// EXPERIMENTAL Allows all connection. Anything on the Android device will be -// able to connect, use with caution! -class UntrustedSecurityPolicy : public SecurityPolicy { - public: - UntrustedSecurityPolicy(); - ~UntrustedSecurityPolicy() override; - bool IsAuthorized(int uid) override; -}; - -// EXPERIMENTAL Only allows the connections from processes with the same UID. In -// most cases this means "from the same APK". -class InternalOnlySecurityPolicy : public SecurityPolicy { - public: - InternalOnlySecurityPolicy(); - ~InternalOnlySecurityPolicy() override; - bool IsAuthorized(int uid) override; -}; - -#ifdef GPR_ANDROID - -// EXPERIMENTAL Only allows the connections from the APK that have the same -// signature. -class SameSignatureSecurityPolicy : public SecurityPolicy { - public: - // `context` is required for getting PackageManager Java class - SameSignatureSecurityPolicy(JavaVM* jvm, jobject context); - ~SameSignatureSecurityPolicy() override; - bool IsAuthorized(int uid) override; - - private: - JavaVM* jvm_; - jobject context_; -}; - -#endif - -} // namespace binder -} // namespace experimental -} // namespace grpc - -#endif // GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H diff --git a/include/grpcpp/support/async_stream.h b/include/grpcpp/support/async_stream.h index 931d321a98..7264fa1504 100644 --- a/include/grpcpp/support/async_stream.h +++ b/include/grpcpp/support/async_stream.h @@ -38,7 +38,11 @@ class ClientAsyncStreamingInterface { /// Start the call that was set up by the constructor, but only if the /// constructor was invoked through the "Prepare" API which doesn't actually - /// start the call + /// start the call. + /// + /// It is illegal to start a write-type operation (eg. Write(), WriteLast(), + /// WritesDone()) while the `StartCall()` operation has not finished + /// (determined by the returning of \a tag). virtual void StartCall(void* tag) = 0; /// Request notification of the reading of the initial metadata. Completion diff --git a/include/grpcpp/support/client_callback.h b/include/grpcpp/support/client_callback.h index 88de62b6d9..b3818eada6 100644 --- a/include/grpcpp/support/client_callback.h +++ b/include/grpcpp/support/client_callback.h @@ -316,6 +316,10 @@ class ClientBidiReactor : public internal::ClientReactor { /// all cases. If it is not called, it indicates an application-level problem /// (like failure to remove a hold). /// + /// OnDone is called exactly once, and not concurrently with any (other) + /// reaction. (Holds may be needed (see above) to prevent OnDone from being + /// called concurrently with calls to the reactor from outside of reactions.) + /// /// \param[in] s The status outcome of this RPC void OnDone(const grpc::Status& /*s*/) override {} diff --git a/include/grpcpp/version_info.h b/include/grpcpp/version_info.h index e9de5915e6..467a9d1965 100644 --- a/include/grpcpp/version_info.h +++ b/include/grpcpp/version_info.h @@ -19,9 +19,9 @@ #define GRPCPP_VERSION_INFO_H #define GRPC_CPP_VERSION_MAJOR 1 -#define GRPC_CPP_VERSION_MINOR 68 +#define GRPC_CPP_VERSION_MINOR 70 #define GRPC_CPP_VERSION_PATCH 0 #define GRPC_CPP_VERSION_TAG "dev" -#define GRPC_CPP_VERSION_STRING "1.68.0-dev" +#define GRPC_CPP_VERSION_STRING "1.70.0-dev" #endif // GRPCPP_VERSION_INFO_H diff --git a/src/core/call/request_buffer.cc b/src/core/call/request_buffer.cc new file mode 100644 index 0000000000..a60b8491c9 --- /dev/null +++ b/src/core/call/request_buffer.cc @@ -0,0 +1,224 @@ +// 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/call/request_buffer.h" + +#include + +#include "absl/strings/str_cat.h" +#include "absl/types/optional.h" +#include "src/core/util/match.h" + +namespace grpc_core { + +RequestBuffer::Buffering::Buffering() {} + +RequestBuffer::RequestBuffer() : state_(absl::in_place_type_t()) {} + +ValueOrFailure RequestBuffer::PushClientInitialMetadata( + ClientMetadataHandle md) { + MutexLock lock(&mu_); + if (absl::get_if(&state_)) return Failure{}; + auto& buffering = absl::get(state_); + CHECK_EQ(buffering.initial_metadata.get(), nullptr); + buffering.initial_metadata = std::move(md); + buffering.buffered += buffering.initial_metadata->TransportSize(); + WakeupAsyncAllPullers(); + return buffering.buffered; +} + +Poll> RequestBuffer::PollPushMessage( + MessageHandle& message) { + MutexLock lock(&mu_); + if (absl::get_if(&state_)) return Failure{}; + size_t buffered = 0; + if (auto* buffering = absl::get_if(&state_)) { + if (winner_ != nullptr) return PendingPush(); + buffering->buffered += message->payload()->Length(); + buffered = buffering->buffered; + buffering->messages.push_back(std::move(message)); + } else { + auto& streaming = absl::get(state_); + CHECK_EQ(streaming.end_of_stream, false); + if (streaming.message != nullptr) { + return PendingPush(); + } + streaming.message = std::move(message); + } + WakeupAsyncAllPullers(); + return buffered; +} + +StatusFlag RequestBuffer::FinishSends() { + MutexLock lock(&mu_); + if (absl::get_if(&state_)) return Failure{}; + if (auto* buffering = absl::get_if(&state_)) { + Buffered buffered(std::move(buffering->initial_metadata), + std::move(buffering->messages)); + state_.emplace(std::move(buffered)); + } else { + auto& streaming = absl::get(state_); + CHECK_EQ(streaming.end_of_stream, false); + streaming.end_of_stream = true; + } + WakeupAsyncAllPullers(); + return Success{}; +} + +void RequestBuffer::Cancel(absl::Status error) { + MutexLock lock(&mu_); + if (absl::holds_alternative(state_)) return; + state_.emplace(std::move(error)); + WakeupAsyncAllPullers(); +} + +void RequestBuffer::Commit(Reader* winner) { + MutexLock lock(&mu_); + CHECK_EQ(winner_, nullptr); + winner_ = winner; + if (auto* buffering = absl::get_if(&state_)) { + if (buffering->initial_metadata != nullptr && + winner->message_index_ == buffering->messages.size() && + winner->pulled_client_initial_metadata_) { + state_.emplace(); + } + } else if (auto* buffered = absl::get_if(&state_)) { + CHECK_NE(buffered->initial_metadata.get(), nullptr); + if (winner->message_index_ == buffered->messages.size()) { + state_.emplace().end_of_stream = true; + } + } + WakeupAsyncAllPullersExcept(winner); +} + +void RequestBuffer::WakeupAsyncAllPullersExcept(Reader* except_reader) { + for (auto wakeup_reader : readers_) { + if (wakeup_reader == except_reader) continue; + wakeup_reader->pull_waker_.WakeupAsync(); + } +} + +Poll> +RequestBuffer::Reader::PollPullClientInitialMetadata() { + MutexLock lock(&buffer_->mu_); + if (buffer_->winner_ != nullptr && buffer_->winner_ != this) { + error_ = absl::CancelledError("Another call was chosen"); + return Failure{}; + } + if (auto* buffering = absl::get_if(&buffer_->state_)) { + if (buffering->initial_metadata.get() == nullptr) { + return buffer_->PendingPull(this); + } + pulled_client_initial_metadata_ = true; + auto result = ClaimObject(buffering->initial_metadata); + buffer_->MaybeSwitchToStreaming(); + return std::move(result); + } + if (auto* buffered = absl::get_if(&buffer_->state_)) { + pulled_client_initial_metadata_ = true; + return ClaimObject(buffered->initial_metadata); + } + error_ = absl::get(buffer_->state_).error; + return Failure{}; +} + +Poll>> +RequestBuffer::Reader::PollPullMessage() { + ReleasableMutexLock lock(&buffer_->mu_); + if (buffer_->winner_ != nullptr && buffer_->winner_ != this) { + error_ = absl::CancelledError("Another call was chosen"); + return Failure{}; + } + if (auto* buffering = absl::get_if(&buffer_->state_)) { + if (message_index_ == buffering->messages.size()) { + return buffer_->PendingPull(this); + } + const auto idx = message_index_; + auto result = ClaimObject(buffering->messages[idx]); + ++message_index_; + buffer_->MaybeSwitchToStreaming(); + return std::move(result); + } + if (auto* buffered = absl::get_if(&buffer_->state_)) { + if (message_index_ == buffered->messages.size()) return absl::nullopt; + const auto idx = message_index_; + ++message_index_; + return ClaimObject(buffered->messages[idx]); + } + if (auto* streaming = absl::get_if(&buffer_->state_)) { + if (streaming->message == nullptr) { + if (streaming->end_of_stream) return absl::nullopt; + return buffer_->PendingPull(this); + } + auto msg = std::move(streaming->message); + auto waker = std::move(buffer_->push_waker_); + lock.Release(); + waker.Wakeup(); + return std::move(msg); + } + error_ = absl::get(buffer_->state_).error; + return Failure{}; +} + +std::string RequestBuffer::DebugString(Reader* caller) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + return absl::StrCat( + "have_winner=", + (winner_ == nullptr ? "no" : (winner_ == caller ? "this" : "other")), + " num_readers=", readers_.size(), + " push_waker=", push_waker_.DebugString(), + Match( + state_, + [](const Buffering& buffering) { + return absl::StrCat( + " buffering initial_metadata=", + (buffering.initial_metadata != nullptr + ? buffering.initial_metadata->DebugString() + : "null"), + " messages=[", + absl::StrJoin( + buffering.messages, ",", + [](std::string* output, const MessageHandle& hdl) { + absl::StrAppend(output, hdl->DebugString()); + }), + "] buffered=", buffering.buffered); + }, + [](const Buffered& buffered) { + return absl::StrCat( + " buffered initial_metadata=", + (buffered.initial_metadata != nullptr + ? buffered.initial_metadata->DebugString() + : "null"), + " messages=[", + absl::StrJoin( + buffered.messages, ",", + [](std::string* output, const MessageHandle& hdl) { + absl::StrAppend( + output, hdl != nullptr ? hdl->DebugString() : "null"); + }), + "]"); + }, + [](const Streaming& streaming) { + return absl::StrCat( + " streaming message=", + (streaming.message != nullptr ? streaming.message->DebugString() + : "null"), + " end_of_stream=", streaming.end_of_stream); + }, + [](const Cancelled& cancelled) { + return absl::StrCat(" cancelled error=", + cancelled.error.ToString()); + })); +} +} // namespace grpc_core diff --git a/src/core/call/request_buffer.h b/src/core/call/request_buffer.h new file mode 100644 index 0000000000..677d417808 --- /dev/null +++ b/src/core/call/request_buffer.h @@ -0,0 +1,192 @@ +// 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_CALL_REQUEST_BUFFER_H +#define GRPC_SRC_CORE_CALL_REQUEST_BUFFER_H + +#include + +#include "src/core/lib/transport/call_spine.h" +#include "src/core/lib/transport/message.h" +#include "src/core/lib/transport/metadata.h" + +namespace grpc_core { + +// Outbound request buffer. +// Collects client->server metadata and messages whilst in its initial buffering +// mode. In buffering mode it can have zero or more Reader objects attached to +// it. +// The buffer can later be switched to committed mode, at which point it +// will have exactly one Reader object attached to it. +// Callers can choose to switch to committed mode based upon policy of their +// choice. +class RequestBuffer { + public: + // One reader of the request buffer. + class Reader { + public: + explicit Reader(RequestBuffer* buffer) ABSL_LOCKS_EXCLUDED(buffer->mu_) + : buffer_(buffer) { + buffer->AddReader(this); + } + ~Reader() ABSL_LOCKS_EXCLUDED(buffer_->mu_) { buffer_->RemoveReader(this); } + + Reader(const Reader&) = delete; + Reader& operator=(const Reader&) = delete; + + // Pull client initial metadata. Returns a promise that resolves to + // ValueOrFailure. + GRPC_MUST_USE_RESULT auto PullClientInitialMetadata() { + return [this]() { return PollPullClientInitialMetadata(); }; + } + // Pull a message. Returns a promise that resolves to a + // ValueOrFailure>. + GRPC_MUST_USE_RESULT auto PullMessage() { + return [this]() { return PollPullMessage(); }; + } + + absl::Status TakeError() { return std::move(error_); } + + private: + friend class RequestBuffer; + + Poll> PollPullClientInitialMetadata(); + Poll>> PollPullMessage(); + + template + T ClaimObject(T& object) ABSL_EXCLUSIVE_LOCKS_REQUIRED(buffer_->mu_) { + if (buffer_->winner_ == this) return std::move(object); + return CopyObject(object); + } + + ClientMetadataHandle CopyObject(const ClientMetadataHandle& md) { + return Arena::MakePooled(md->Copy()); + } + + MessageHandle CopyObject(const MessageHandle& msg) { + return Arena::MakePooled(msg->payload()->Copy(), msg->flags()); + } + + RequestBuffer* const buffer_; + bool pulled_client_initial_metadata_ = false; + size_t message_index_ = 0; + absl::Status error_; + Waker pull_waker_; + }; + + RequestBuffer(); + + // Push ClientInitialMetadata into the buffer. + // This is instantaneous, and returns success with the amount of data + // buffered, or failure. + ValueOrFailure PushClientInitialMetadata(ClientMetadataHandle md); + // Resolves to a ValueOrFailure where the size_t is the amount of data + // buffered (or 0 if we're in committed mode). + GRPC_MUST_USE_RESULT auto PushMessage(MessageHandle message) { + return [this, message = std::move(message)]() mutable { + return PollPushMessage(message); + }; + } + // Push end of stream (client half-closure). + StatusFlag FinishSends(); + // Cancel the request, propagate failure to all readers. + void Cancel(absl::Status error = absl::CancelledError()); + + // Switch to committed mode - needs to be called exactly once with the winning + // reader. All other readers will see failure. + void Commit(Reader* winner); + + bool committed() const { + MutexLock lock(&mu_); + return winner_ != nullptr; + } + + private: + // Buffering state: we're collecting metadata and messages. + struct Buffering { + Buffering(); + // Initial metadata, or nullptr if not yet received. + ClientMetadataHandle initial_metadata; + // Buffered messages. + absl::InlinedVector messages; + // Amount of data buffered. + size_t buffered = 0; + }; + // Buffered state: all messages have been collected (the client has finished + // sending). + struct Buffered { + Buffered(ClientMetadataHandle md, + absl::InlinedVector msgs) + : initial_metadata(std::move(md)), messages(std::move(msgs)) {} + ClientMetadataHandle initial_metadata; + absl::InlinedVector messages; + }; + // Streaming state: we're streaming messages to the server. + // This implies winner_ is set. + struct Streaming { + MessageHandle message; + bool end_of_stream = false; + }; + // Cancelled state: the request has been cancelled. + struct Cancelled { + explicit Cancelled(absl::Status error) : error(std::move(error)) {} + absl::Status error; + }; + using State = absl::variant; + + Poll> PollPushMessage(MessageHandle& message); + Pending PendingPull(Reader* reader) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + reader->pull_waker_ = Activity::current()->MakeOwningWaker(); + return Pending{}; + } + Pending PendingPush() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + push_waker_ = Activity::current()->MakeOwningWaker(); + return Pending{}; + } + void MaybeSwitchToStreaming() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + auto& buffering = absl::get(state_); + if (winner_ == nullptr) return; + if (winner_->message_index_ < buffering.messages.size()) return; + state_.emplace(); + push_waker_.Wakeup(); + } + + void WakeupAsyncAllPullers() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + WakeupAsyncAllPullersExcept(nullptr); + } + void WakeupAsyncAllPullersExcept(Reader* except_reader) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + + void AddReader(Reader* reader) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + readers_.insert(reader); + } + + void RemoveReader(Reader* reader) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) { + readers_.erase(reader); + } + + std::string DebugString(Reader* caller) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + + mutable Mutex mu_; + Reader* winner_ ABSL_GUARDED_BY(mu_){nullptr}; + State state_ ABSL_GUARDED_BY(mu_); + // TODO(ctiller): change this to an intrusively linked list to avoid + // allocations. + absl::flat_hash_set readers_ ABSL_GUARDED_BY(mu_); + Waker push_waker_ ABSL_GUARDED_BY(mu_); +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_CALL_REQUEST_BUFFER_H diff --git a/src/core/client_channel/backup_poller.cc b/src/core/client_channel/backup_poller.cc index 43b485dc7e..ef13d2285e 100644 --- a/src/core/client_channel/backup_poller.cc +++ b/src/core/client_channel/backup_poller.cc @@ -25,7 +25,7 @@ #include "absl/log/log.h" #include "absl/status/status.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr.h" @@ -57,8 +57,19 @@ static backup_poller* g_poller = nullptr; // guarded by g_poller_mu // treated as const. static grpc_core::Duration g_poll_interval = grpc_core::Duration::Milliseconds(DEFAULT_POLL_INTERVAL_MS); +// TODO(hork): delete the backup poller when EventEngine is rolled out +// everywhere. +static bool g_backup_polling_disabled; void grpc_client_channel_global_init_backup_polling() { + // Disable backup polling if EventEngine is used everywhere. + g_backup_polling_disabled = grpc_core::IsEventEngineClientEnabled() && + grpc_core::IsEventEngineListenerEnabled() && + grpc_core::IsEventEngineDnsEnabled(); + if (g_backup_polling_disabled) { + return; + } + gpr_mu_init(&g_poller_mu); int32_t poll_interval_ms = grpc_core::ConfigVars::Get().ClientChannelBackupPollIntervalMs(); @@ -146,7 +157,8 @@ static void g_poller_init_locked() { void grpc_client_channel_start_backup_polling( grpc_pollset_set* interested_parties) { - if (g_poll_interval == grpc_core::Duration::Zero() || + if (g_backup_polling_disabled || + g_poll_interval == grpc_core::Duration::Zero() || grpc_iomgr_run_in_background()) { return; } @@ -165,7 +177,8 @@ void grpc_client_channel_start_backup_polling( void grpc_client_channel_stop_backup_polling( grpc_pollset_set* interested_parties) { - if (g_poll_interval == grpc_core::Duration::Zero() || + if (g_backup_polling_disabled || + g_poll_interval == grpc_core::Duration::Zero() || grpc_iomgr_run_in_background()) { return; } diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc index 315befd72e..08a9ee4c48 100644 --- a/src/core/client_channel/client_channel.cc +++ b/src/core/client_channel/client_channel.cc @@ -51,13 +51,14 @@ #include "src/core/client_channel/dynamic_filters.h" #include "src/core/client_channel/global_subchannel_pool.h" #include "src/core/client_channel/local_subchannel_pool.h" +#include "src/core/client_channel/retry_interceptor.h" #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #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/iomgr/resolved_address.h" @@ -212,7 +213,7 @@ class ClientChannel::SubchannelWrapper // // This class handles things like hopping into the WorkSerializer // before passing notifications to the LB policy and propagating -// keepalive information betwen subchannels. +// keepalive information between subchannels. class ClientChannel::SubchannelWrapper::WatcherWrapper : public Subchannel::ConnectivityStateWatcherInterface { public: @@ -260,7 +261,7 @@ class ClientChannel::SubchannelWrapper::WatcherWrapper << subchannel_wrapper_.get() << " subchannel " << subchannel_wrapper_->subchannel_.get() << " watcher=" << watcher_.get() - << "state=" << ConnectivityStateName(state) << " status=" << status; + << " state=" << ConnectivityStateName(state) << " status=" << status; absl::optional keepalive_throttling = status.GetPayload(kKeepaliveThrottlingKey); if (keepalive_throttling.has_value()) { @@ -1291,13 +1292,11 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked( GRPC_CLIENT_CHANNEL, builder); // Add filters returned by the config selector (e.g., xDS HTTP filters). config_selector->AddFilters(builder); - // TODO(roth, ctiller): When we implement the retry interceptor, that - // needs to be added *after* the filters added by the config selector. const bool enable_retries = !channel_args_.WantMinimalStack() && channel_args_.GetBool(GRPC_ARG_ENABLE_RETRIES).value_or(true); if (enable_retries) { - Crash("call v3 stack does not yet support retries"); + builder.Add(); } // Create call destination. auto top_of_stack_call_destination = builder.Build(call_destination_); diff --git a/src/core/client_channel/client_channel_args.h b/src/core/client_channel/client_channel_args.h new file mode 100644 index 0000000000..3452f1c5f4 --- /dev/null +++ b/src/core/client_channel/client_channel_args.h @@ -0,0 +1,21 @@ +// 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_CLIENT_CHANNEL_ARGS_H +#define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_ARGS_H + +// Channel arg key for server URI string. +#define GRPC_ARG_SERVER_URI "grpc.server_uri" + +#endif // GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_ARGS_H diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc index 6b87eb436c..4d2e8a2e19 100644 --- a/src/core/client_channel/client_channel_filter.cc +++ b/src/core/client_channel/client_channel_filter.cc @@ -59,12 +59,12 @@ #include "src/core/client_channel/retry_filter.h" #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_interface_internal.h" +#include "src/core/config/core_configuration.h" #include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/exec_ctx.h" @@ -628,7 +628,7 @@ class ClientChannelFilter::SubchannelWrapper final // // This class handles things like hopping into the WorkSerializer // before passing notifications to the LB policy and propagating - // keepalive information betwen subchannels. + // keepalive information between subchannels. class WatcherWrapper final : public Subchannel::ConnectivityStateWatcherInterface { public: @@ -2496,7 +2496,7 @@ void ClientChannelFilter::LoadBalancedCall:: grpc_polling_entity_del_from_pollset_set(pollent(), chand_->interested_parties_); // Note: There's no need to actually remove the call from the queue - // here, beacuse that will be done in either + // here, because that will be done in either // LbQueuedCallCanceller::CancelLocked() or // in ClientChannelFilter::UpdateStateAndPickerLocked(). } diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index c2318360fb..7d2fb8f1f5 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -35,6 +35,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "src/core/channelz/channelz.h" +#include "src/core/client_channel/client_channel_args.h" #include "src/core/client_channel/client_channel_factory.h" #include "src/core/client_channel/config_selector.h" #include "src/core/client_channel/dynamic_filters.h" @@ -78,9 +79,6 @@ // Calls on a disconnected client channel are queued until a connection is // established. -// Channel arg key for server URI string. -#define GRPC_ARG_SERVER_URI "grpc.server_uri" - // Max number of batches that can be pending on a call at any given // time. This includes one batch for each of the following ops: // recv_initial_metadata diff --git a/src/core/client_channel/client_channel_plugin.cc b/src/core/client_channel/client_channel_plugin.cc index afb9974195..65b269d1df 100644 --- a/src/core/client_channel/client_channel_plugin.cc +++ b/src/core/client_channel/client_channel_plugin.cc @@ -23,8 +23,8 @@ #include "src/core/client_channel/client_channel_filter.h" #include "src/core/client_channel/client_channel_service_config.h" #include "src/core/client_channel/retry_service_config.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/surface/channel_stack_type.h" namespace grpc_core { diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h index 6d33d11b17..53dd71f7ff 100644 --- a/src/core/client_channel/client_channel_service_config.h +++ b/src/core/client_channel/client_channel_service_config.h @@ -25,8 +25,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" diff --git a/src/core/client_channel/direct_channel.cc b/src/core/client_channel/direct_channel.cc index 6ccde807dc..6536f9c78a 100644 --- a/src/core/client_channel/direct_channel.cc +++ b/src/core/client_channel/direct_channel.cc @@ -14,7 +14,7 @@ #include "src/core/client_channel/direct_channel.h" -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/event_engine/event_engine_context.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/client_call.h" @@ -59,7 +59,7 @@ void DirectChannel::StartCall(UnstartedCallHandler unstarted_handler) { "start", [interception_chain = interception_chain_, unstarted_handler]() mutable { interception_chain->StartCall(std::move(unstarted_handler)); - return []() { return Empty{}; }; + return []() {}; }); } diff --git a/src/core/client_channel/load_balanced_call_destination.cc b/src/core/client_channel/load_balanced_call_destination.cc index 2415e367cc..86d1da29c8 100644 --- a/src/core/client_channel/load_balanced_call_destination.cc +++ b/src/core/client_channel/load_balanced_call_destination.cc @@ -19,8 +19,8 @@ #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/config/core_configuration.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/promise/loop.h" #include "src/core/telemetry/call_tracer.h" 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 7e3abc4a5a..eba9999f37 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.cc +++ b/src/core/client_channel/retry_filter_legacy_call_data.cc @@ -1268,6 +1268,7 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::OnComplete( } if (batch_data->batch_.send_message) { ++call_attempt->completed_send_message_count_; + call_attempt->send_message_.Clear(); } if (batch_data->batch_.send_trailing_metadata) { call_attempt->completed_send_trailing_metadata_ = true; @@ -1348,7 +1349,8 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData:: calld->send_messages_[call_attempt_->started_send_message_count_]; ++call_attempt_->started_send_message_count_; batch_.send_message = true; - batch_.payload->send_message.send_message = cache.slices; + call_attempt_->send_message_ = cache.slices->Copy(); + batch_.payload->send_message.send_message = &call_attempt_->send_message_; batch_.payload->send_message.flags = cache.flags; } diff --git a/src/core/client_channel/retry_filter_legacy_call_data.h b/src/core/client_channel/retry_filter_legacy_call_data.h index b121a8735b..4569d865b1 100644 --- a/src/core/client_channel/retry_filter_legacy_call_data.h +++ b/src/core/client_channel/retry_filter_legacy_call_data.h @@ -263,6 +263,8 @@ class RetryFilter::LegacyCallData final { grpc_transport_stream_op_batch_payload batch_payload_; // For send_initial_metadata. grpc_metadata_batch send_initial_metadata_; + // For send_message. + SliceBuffer send_message_; // For send_trailing_metadata. grpc_metadata_batch send_trailing_metadata_; // For intercepting recv_initial_metadata. diff --git a/src/core/client_channel/retry_interceptor.cc b/src/core/client_channel/retry_interceptor.cc new file mode 100644 index 0000000000..bef61cbe1e --- /dev/null +++ b/src/core/client_channel/retry_interceptor.cc @@ -0,0 +1,406 @@ +// 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/retry_interceptor.h" + +#include "src/core/lib/promise/cancel_callback.h" +#include "src/core/lib/promise/for_each.h" +#include "src/core/lib/promise/map.h" +#include "src/core/lib/promise/sleep.h" +#include "src/core/service_config/service_config_call_data.h" + +namespace grpc_core { + +namespace { +size_t GetMaxPerRpcRetryBufferSize(const ChannelArgs& args) { + // By default, we buffer 256 KiB per RPC for retries. + // TODO(roth): Do we have any data to suggest a better value? + static constexpr int kDefaultPerRpcRetryBufferSize = (256 << 10); + return Clamp(args.GetInt(GRPC_ARG_PER_RPC_RETRY_BUFFER_SIZE) + .value_or(kDefaultPerRpcRetryBufferSize), + 0, INT_MAX); +} +} // namespace + +namespace retry_detail { + +RetryState::RetryState( + const internal::RetryMethodConfig* retry_policy, + RefCountedPtr retry_throttle_data) + : retry_policy_(retry_policy), + retry_throttle_data_(std::move(retry_throttle_data)), + retry_backoff_( + BackOff::Options() + .set_initial_backoff(retry_policy_ == nullptr + ? Duration::Zero() + : retry_policy_->initial_backoff()) + .set_multiplier(retry_policy_ == nullptr + ? 0 + : retry_policy_->backoff_multiplier()) + // This value was picked arbitrarily. It can be changed if + // there is any even moderately compelling reason to do so. + .set_jitter(0.2) + .set_max_backoff(retry_policy_ == nullptr + ? Duration::Zero() + : retry_policy_->max_backoff())) {} + +absl::optional RetryState::ShouldRetry( + const ServerMetadata& md, bool committed, + absl::FunctionRef lazy_attempt_debug_string) { + // If no retry policy, don't retry. + if (retry_policy_ == nullptr) { + GRPC_TRACE_LOG(retry, INFO) + << lazy_attempt_debug_string() << " no retry policy"; + return absl::nullopt; + } + const auto status = md.get(GrpcStatusMetadata()); + if (status.has_value()) { + if (GPR_LIKELY(*status == GRPC_STATUS_OK)) { + if (retry_throttle_data_ != nullptr) { + retry_throttle_data_->RecordSuccess(); + } + GRPC_TRACE_LOG(retry, INFO) + << lazy_attempt_debug_string() << " call succeeded"; + return absl::nullopt; + } + // Status is not OK. Check whether the status is retryable. + if (!retry_policy_->retryable_status_codes().Contains(*status)) { + GRPC_TRACE_LOG(retry, INFO) << lazy_attempt_debug_string() << ": status " + << grpc_status_code_to_string(*status) + << " not configured as retryable"; + return absl::nullopt; + } + } + // Record the failure and check whether retries are throttled. + // Note that it's important for this check to come after the status + // code check above, since we should only record failures whose statuses + // match the configured retryable status codes, so that we don't count + // things like failures due to malformed requests (INVALID_ARGUMENT). + // Conversely, it's important for this to come before the remaining + // checks, so that we don't fail to record failures due to other factors. + if (retry_throttle_data_ != nullptr && + !retry_throttle_data_->RecordFailure()) { + GRPC_TRACE_LOG(retry, INFO) + << lazy_attempt_debug_string() << " retries throttled"; + return absl::nullopt; + } + // Check whether the call is committed. + if (committed) { + GRPC_TRACE_LOG(retry, INFO) + << lazy_attempt_debug_string() << " retries already committed"; + return absl::nullopt; + } + // Check whether we have retries remaining. + ++num_attempts_completed_; + if (num_attempts_completed_ >= retry_policy_->max_attempts()) { + GRPC_TRACE_LOG(retry, INFO) + << lazy_attempt_debug_string() << " exceeded " + << retry_policy_->max_attempts() << " retry attempts"; + return absl::nullopt; + } + // Check server push-back. + const auto server_pushback = md.get(GrpcRetryPushbackMsMetadata()); + if (server_pushback.has_value() && server_pushback < Duration::Zero()) { + GRPC_TRACE_LOG(retry, INFO) << lazy_attempt_debug_string() + << " not retrying due to server push-back"; + return absl::nullopt; + } + // We should retry. + Duration next_attempt_timeout; + if (server_pushback.has_value()) { + CHECK_GE(*server_pushback, Duration::Zero()); + next_attempt_timeout = *server_pushback; + retry_backoff_.Reset(); + } else { + next_attempt_timeout = retry_backoff_.NextAttemptDelay(); + } + GRPC_TRACE_LOG(retry, INFO) + << lazy_attempt_debug_string() << " server push-back: retry in " + << next_attempt_timeout; + return next_attempt_timeout; +} + +absl::StatusOr> +ServerRetryThrottleDataFromChannelArgs(const ChannelArgs& args) { + // Get retry throttling parameters from service config. + auto* service_config = args.GetObject(); + if (service_config == nullptr) return nullptr; + const auto* config = static_cast( + service_config->GetGlobalParsedConfig( + internal::RetryServiceConfigParser::ParserIndex())); + if (config == nullptr) return nullptr; + // Get server name from target URI. + auto server_uri = args.GetString(GRPC_ARG_SERVER_URI); + if (!server_uri.has_value()) { + return GRPC_ERROR_CREATE( + "server URI channel arg missing or wrong type in client channel " + "filter"); + } + absl::StatusOr uri = URI::Parse(*server_uri); + if (!uri.ok() || uri->path().empty()) { + return GRPC_ERROR_CREATE("could not extract server name from target URI"); + } + std::string server_name(absl::StripPrefix(uri->path(), "/")); + // Get throttling config for server_name. + return internal::ServerRetryThrottleMap::Get()->GetDataForServer( + server_name, config->max_milli_tokens(), config->milli_token_ratio()); +} + +} // namespace retry_detail + +//////////////////////////////////////////////////////////////////////////////// +// RetryInterceptor + +absl::StatusOr> RetryInterceptor::Create( + const ChannelArgs& args, const FilterArgs&) { + auto retry_throttle_data = + retry_detail::ServerRetryThrottleDataFromChannelArgs(args); + if (!retry_throttle_data.ok()) { + return retry_throttle_data.status(); + } + return MakeRefCounted(args, + std::move(*retry_throttle_data)); +} + +RetryInterceptor::RetryInterceptor( + const ChannelArgs& args, + RefCountedPtr retry_throttle_data) + : per_rpc_retry_buffer_size_(GetMaxPerRpcRetryBufferSize(args)), + service_config_parser_index_( + internal::RetryServiceConfigParser::ParserIndex()), + retry_throttle_data_(std::move(retry_throttle_data)) {} + +void RetryInterceptor::InterceptCall( + UnstartedCallHandler unstarted_call_handler) { + auto call_handler = unstarted_call_handler.StartCall(); + auto* arena = call_handler.arena(); + auto call = arena->MakeRefCounted(RefAsSubclass(), + std::move(call_handler)); + call->StartAttempt(); + call->Start(); +} + +const internal::RetryMethodConfig* RetryInterceptor::GetRetryPolicy() { + auto* svc_cfg_call_data = MaybeGetContext(); + if (svc_cfg_call_data == nullptr) return nullptr; + return static_cast( + svc_cfg_call_data->GetMethodParsedConfig(service_config_parser_index_)); +} + +//////////////////////////////////////////////////////////////////////////////// +// RetryInterceptor::Call + +RetryInterceptor::Call::Call(RefCountedPtr interceptor, + CallHandler call_handler) + : call_handler_(std::move(call_handler)), + interceptor_(std::move(interceptor)), + retry_state_(interceptor_->GetRetryPolicy(), + interceptor_->retry_throttle_data_) { + GRPC_TRACE_LOG(retry, INFO) + << DebugTag() << " retry call created: " << retry_state_; +} + +auto RetryInterceptor::Call::ClientToBuffer() { + return TrySeq( + call_handler_.PullClientInitialMetadata(), + [self = Ref()](ClientMetadataHandle metadata) mutable { + GRPC_TRACE_LOG(retry, INFO) + << self->DebugTag() + << " got client initial metadata: " << metadata->DebugString(); + return self->request_buffer_.PushClientInitialMetadata( + std::move(metadata)); + }, + [self = Ref()](size_t buffered) { + self->MaybeCommit(buffered); + return ForEach( + MessagesFrom(self->call_handler_), [self](MessageHandle message) { + GRPC_TRACE_LOG(retry, INFO) + << self->DebugTag() << " got client message " + << message->DebugString(); + return TrySeq( + self->request_buffer_.PushMessage(std::move(message)), + [self](size_t buffered) { + self->MaybeCommit(buffered); + return absl::OkStatus(); + }); + }); + }); +} + +void RetryInterceptor::Call::Start() { + call_handler_.SpawnGuarded("client_to_buffer", [self = Ref()]() { + return OnCancel(Map(self->ClientToBuffer(), + [self](absl::Status status) { + if (status.ok()) { + self->request_buffer_.FinishSends(); + } else { + self->request_buffer_.Cancel(status); + } + return status; + }), + [self]() { self->request_buffer_.Cancel(); }); + }); +} + +void RetryInterceptor::Call::StartAttempt() { + if (current_attempt_ != nullptr) { + current_attempt_->Cancel(); + } + auto current_attempt = call_handler_.arena()->MakeRefCounted(Ref()); + current_attempt_ = current_attempt.get(); + current_attempt->Start(); +} + +void RetryInterceptor::Call::MaybeCommit(size_t buffered) { + GRPC_TRACE_LOG(retry, INFO) << DebugTag() << " buffered:" << buffered << "/" + << interceptor_->per_rpc_retry_buffer_size_; + if (buffered >= interceptor_->per_rpc_retry_buffer_size_) { + std::ignore = current_attempt_->Commit(); + } +} + +std::string RetryInterceptor::Call::DebugTag() { + return absl::StrFormat("%s call:%p", Activity::current()->DebugTag(), this); +} + +//////////////////////////////////////////////////////////////////////////////// +// RetryInterceptor::Attempt + +RetryInterceptor::Attempt::Attempt(RefCountedPtr call) + : call_(std::move(call)), reader_(call_->request_buffer()) { + GRPC_TRACE_LOG(retry, INFO) << DebugTag() << " retry attempt created"; +} + +RetryInterceptor::Attempt::~Attempt() { call_->RemoveAttempt(this); } + +auto RetryInterceptor::Attempt::ServerToClientGotInitialMetadata( + ServerMetadataHandle md) { + GRPC_TRACE_LOG(retry, INFO) + << DebugTag() << " get server initial metadata " << md->DebugString(); + const bool committed = Commit(); + return If( + committed, + [&]() { + call_->call_handler()->SpawnPushServerInitialMetadata(std::move(md)); + return Seq(ForEach(MessagesFrom(initiator_), + [call = call_](MessageHandle message) { + GRPC_TRACE_LOG(retry, INFO) + << call->DebugTag() << " got server message " + << message->DebugString(); + return call->call_handler()->SpawnPushMessage( + std::move(message)); + }), + initiator_.PullServerTrailingMetadata(), + [call = call_](ServerMetadataHandle md) { + GRPC_TRACE_LOG(retry, INFO) + << call->DebugTag() + << " got server trailing metadata: " + << md->DebugString(); + call->call_handler()->SpawnPushServerTrailingMetadata( + std::move(md)); + return absl::OkStatus(); + }); + }, + [&]() { return []() { return absl::CancelledError(); }; }); +} + +auto RetryInterceptor::Attempt::ServerToClientGotTrailersOnlyResponse() { + GRPC_TRACE_LOG(retry, INFO) << DebugTag() << " got trailers only response"; + return Seq( + initiator_.PullServerTrailingMetadata(), + [self = Ref()](ServerMetadataHandle md) { + GRPC_TRACE_LOG(retry, INFO) + << self->DebugTag() + << " got server trailing metadata: " << md->DebugString(); + auto delay = self->call_->ShouldRetry( + *md, + [self = self.get()]() -> std::string { return self->DebugTag(); }); + return If( + delay.has_value(), + [self, delay]() { + return Map(Sleep(*delay), [call = self->call_](absl::Status) { + call->StartAttempt(); + return absl::OkStatus(); + }); + }, + [self, md = std::move(md)]() mutable { + if (!self->Commit()) return absl::CancelledError(); + self->call_->call_handler()->SpawnPushServerTrailingMetadata( + std::move(md)); + return absl::OkStatus(); + }); + }); +} + +auto RetryInterceptor::Attempt::ServerToClient() { + return TrySeq( + initiator_.PullServerInitialMetadata(), + [self = Ref()](absl::optional metadata) { + const bool has_md = metadata.has_value(); + return If( + has_md, + [self = self.get(), md = std::move(metadata)]() mutable { + return self->ServerToClientGotInitialMetadata(std::move(*md)); + }, + [self = self.get()]() { + return self->ServerToClientGotTrailersOnlyResponse(); + }); + }); +} + +bool RetryInterceptor::Attempt::Commit(SourceLocation whence) { + if (committed_) return true; + GRPC_TRACE_LOG(retry, INFO) << DebugTag() << " commit attempt from " + << whence.file() << ":" << whence.line(); + if (!call_->IsCurrentAttempt(this)) return false; + committed_ = true; + call_->request_buffer()->Commit(reader()); + return true; +} + +auto RetryInterceptor::Attempt::ClientToServer() { + return TrySeq( + reader_.PullClientInitialMetadata(), + [self = Ref()](ClientMetadataHandle metadata) { + int num_attempts_completed = self->call_->num_attempts_completed(); + if (GPR_UNLIKELY(num_attempts_completed > 0)) { + metadata->Set(GrpcPreviousRpcAttemptsMetadata(), + num_attempts_completed); + } else { + metadata->Remove(GrpcPreviousRpcAttemptsMetadata()); + } + self->initiator_ = self->call_->interceptor()->MakeChildCall( + std::move(metadata), self->call_->call_handler()->arena()->Ref()); + self->call_->call_handler()->AddChildCall(self->initiator_); + self->initiator_.SpawnGuarded( + "server_to_client", [self]() { return self->ServerToClient(); }); + return ForEach( + MessagesFrom(&self->reader_), [self](MessageHandle message) { + return self->initiator_.SpawnPushMessage(std::move(message)); + }); + }); +} + +void RetryInterceptor::Attempt::Start() { + call_->call_handler()->SpawnGuardedUntilCallCompletes( + "buffer_to_server", [self = Ref()]() { return self->ClientToServer(); }); +} + +void RetryInterceptor::Attempt::Cancel() { initiator_.SpawnCancel(); } + +std::string RetryInterceptor::Attempt::DebugTag() const { + return absl::StrFormat("%s attempt:%p", call_->DebugTag(), this); +} + +} // namespace grpc_core diff --git a/src/core/client_channel/retry_interceptor.h b/src/core/client_channel/retry_interceptor.h new file mode 100644 index 0000000000..1915e4778c --- /dev/null +++ b/src/core/client_channel/retry_interceptor.h @@ -0,0 +1,157 @@ +// 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_RETRY_INTERCEPTOR_H +#define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_INTERCEPTOR_H + +#include "src/core/call/request_buffer.h" +#include "src/core/client_channel/client_channel_args.h" +#include "src/core/client_channel/retry_service_config.h" +#include "src/core/client_channel/retry_throttle.h" +#include "src/core/filter/filter_args.h" +#include "src/core/lib/transport/interception_chain.h" +#include "src/core/util/backoff.h" + +namespace grpc_core { + +namespace retry_detail { +class RetryState { + public: + RetryState( + const internal::RetryMethodConfig* retry_policy, + RefCountedPtr retry_throttle_data); + + // if nullopt --> commit & don't retry + // if duration --> retry after duration + absl::optional ShouldRetry( + const ServerMetadata& md, bool committed, + absl::FunctionRef lazy_attempt_debug_string); + int num_attempts_completed() const { return num_attempts_completed_; } + + template + friend void AbslStringify(Sink& sink, const RetryState& state) { + sink.Append(absl::StrCat( + "policy:{", + state.retry_policy_ != nullptr ? absl::StrCat(*state.retry_policy_) + : "none", + "} throttle:", state.retry_throttle_data_ != nullptr, + " attempts:", state.num_attempts_completed_)); + } + + private: + const internal::RetryMethodConfig* const retry_policy_; + RefCountedPtr retry_throttle_data_; + int num_attempts_completed_ = 0; + BackOff retry_backoff_; +}; + +absl::StatusOr> +ServerRetryThrottleDataFromChannelArgs(const ChannelArgs& args); +} // namespace retry_detail + +class RetryInterceptor : public Interceptor { + public: + RetryInterceptor( + const ChannelArgs& args, + RefCountedPtr retry_throttle_data); + + static absl::StatusOr> Create( + const ChannelArgs& args, const FilterArgs&); + + void Orphaned() override {} + + protected: + void InterceptCall(UnstartedCallHandler unstarted_call_handler) override; + + private: + class Attempt; + + class Call final + : public RefCounted { + public: + Call(RefCountedPtr interceptor, CallHandler call_handler); + + void StartAttempt(); + void Start(); + + RequestBuffer* request_buffer() { return &request_buffer_; } + CallHandler* call_handler() { return &call_handler_; } + RetryInterceptor* interceptor() { return interceptor_.get(); } + // if nullopt --> commit & don't retry + // if duration --> retry after duration + absl::optional ShouldRetry( + const ServerMetadata& md, + absl::FunctionRef lazy_attempt_debug_string) { + return retry_state_.ShouldRetry(md, request_buffer_.committed(), + lazy_attempt_debug_string); + } + int num_attempts_completed() const { + return retry_state_.num_attempts_completed(); + } + void RemoveAttempt(Attempt* attempt) { + if (current_attempt_ == attempt) current_attempt_ = nullptr; + } + bool IsCurrentAttempt(Attempt* attempt) { + CHECK(attempt != nullptr); + return current_attempt_ == attempt; + } + + std::string DebugTag(); + + private: + void MaybeCommit(size_t buffered); + auto ClientToBuffer(); + + RequestBuffer request_buffer_; + CallHandler call_handler_; + RefCountedPtr interceptor_; + Attempt* current_attempt_ = nullptr; + retry_detail::RetryState retry_state_; + }; + + class Attempt final + : public RefCounted { + public: + explicit Attempt(RefCountedPtr call); + ~Attempt(); + + void Start(); + void Cancel(); + GRPC_MUST_USE_RESULT bool Commit(SourceLocation whence = {}); + RequestBuffer::Reader* reader() { return &reader_; } + + std::string DebugTag() const; + + private: + auto ClientToServer(); + auto ServerToClient(); + auto ServerToClientGotInitialMetadata(ServerMetadataHandle md); + auto ServerToClientGotTrailersOnlyResponse(); + + RefCountedPtr call_; + RequestBuffer::Reader reader_; + CallInitiator initiator_; + bool committed_ = false; + }; + + const internal::RetryMethodConfig* GetRetryPolicy(); + + const size_t per_rpc_retry_buffer_size_; + const size_t service_config_parser_index_; + const RefCountedPtr retry_throttle_data_; +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_INTERCEPTOR_H diff --git a/src/core/client_channel/retry_service_config.cc b/src/core/client_channel/retry_service_config.cc index 01e4c867ea..bc281a2670 100644 --- a/src/core/client_channel/retry_service_config.cc +++ b/src/core/client_channel/retry_service_config.cc @@ -30,9 +30,9 @@ #include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/util/json/json_channel_args.h" // As per the retry design, we do not allow more than 5 retry attempts. diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h index 91c6fe52dc..6edcaba4cc 100644 --- a/src/core/client_channel/retry_service_config.h +++ b/src/core/client_channel/retry_service_config.h @@ -25,9 +25,9 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" @@ -69,6 +69,19 @@ class RetryMethodConfig final : public ServiceConfigParser::ParsedConfig { void JsonPostLoad(const Json& json, const JsonArgs& args, ValidationErrors* errors); + template + friend void AbslStringify(Sink& sink, const RetryMethodConfig& config) { + sink.Append(absl::StrCat( + "max_attempts:", config.max_attempts_, " initial_backoff:", + config.initial_backoff_, " max_backoff:", config.max_backoff_, + " backoff_multiplier:", config.backoff_multiplier_, + " retryable_status_codes:", config.retryable_status_codes_.ToString(), + " per_attempt_recv_timeout:", + config.per_attempt_recv_timeout_.has_value() + ? absl::StrCat(*config.per_attempt_recv_timeout_) + : "none")); + } + private: int max_attempts_ = 0; Duration initial_backoff_; diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index 56918f0f29..9692e073a0 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -39,12 +39,12 @@ #include "src/core/channelz/channelz.h" #include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/subchannel_pool_interface.h" +#include "src/core/config/core_configuration.h" #include "src/core/handshaker/proxy_mapper_registry.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/src/core/lib/config/config_vars.cc b/src/core/config/config_vars.cc similarity index 98% rename from src/core/lib/config/config_vars.cc rename to src/core/config/config_vars.cc index 6aa9f551d7..4abd223540 100644 --- a/src/core/lib/config/config_vars.cc +++ b/src/core/config/config_vars.cc @@ -16,13 +16,13 @@ // Automatically generated by tools/codegen/core/gen_config_vars.py // -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include #include "absl/flags/flag.h" #include "absl/strings/escaping.h" -#include "src/core/lib/config/load_config.h" +#include "src/core/config/load_config.h" #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING #define GPR_DEFAULT_LOG_VERBOSITY_STRING "" diff --git a/src/core/lib/config/config_vars.h b/src/core/config/config_vars.h similarity index 97% rename from src/core/lib/config/config_vars.h rename to src/core/config/config_vars.h index b7ea541ad9..3890a18339 100644 --- a/src/core/lib/config/config_vars.h +++ b/src/core/config/config_vars.h @@ -16,8 +16,8 @@ // Automatically generated by tools/codegen/core/gen_config_vars.py // -#ifndef GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H -#define GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H +#ifndef GRPC_SRC_CORE_CONFIG_CONFIG_VARS_H +#define GRPC_SRC_CORE_CONFIG_CONFIG_VARS_H #include #include @@ -125,4 +125,4 @@ class GPR_DLL ConfigVars { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H +#endif // GRPC_SRC_CORE_CONFIG_CONFIG_VARS_H diff --git a/src/core/lib/config/config_vars_non_generated.cc b/src/core/config/config_vars_non_generated.cc similarity index 97% rename from src/core/lib/config/config_vars_non_generated.cc rename to src/core/config/config_vars_non_generated.cc index 78af08c1d8..32c4da5317 100644 --- a/src/core/lib/config/config_vars_non_generated.cc +++ b/src/core/config/config_vars_non_generated.cc @@ -17,7 +17,7 @@ #include #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" namespace grpc_core { diff --git a/src/core/lib/config/core_configuration.cc b/src/core/config/core_configuration.cc similarity index 97% rename from src/core/lib/config/core_configuration.cc rename to src/core/config/core_configuration.cc index 3623ac53d8..5c5dc46944 100644 --- a/src/core/lib/config/core_configuration.cc +++ b/src/core/config/core_configuration.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include @@ -83,7 +83,7 @@ const CoreConfiguration& CoreConfiguration::BuildNewAndMaybeSet() { } // Finally, call the built in configuration builder. if (default_builder_ != nullptr) (*default_builder_)(&builder); - // Use builder to construct a confguration + // Use builder to construct a configuration CoreConfiguration* p = builder.Build(); // Try to set configuration global - it's possible another thread raced us // here, in which case we drop the work we did and use the one that got set diff --git a/src/core/lib/config/core_configuration.h b/src/core/config/core_configuration.h similarity index 98% rename from src/core/lib/config/core_configuration.h rename to src/core/config/core_configuration.h index aa2f79c64f..29bacf96d5 100644 --- a/src/core/lib/config/core_configuration.h +++ b/src/core/config/core_configuration.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H -#define GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H +#ifndef GRPC_SRC_CORE_CONFIG_CORE_CONFIGURATION_H +#define GRPC_SRC_CORE_CONFIG_CORE_CONFIGURATION_H #include @@ -239,4 +239,4 @@ extern void BuildCoreConfiguration(CoreConfiguration::Builder* builder); } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H +#endif // GRPC_SRC_CORE_CONFIG_CORE_CONFIGURATION_H diff --git a/src/core/lib/config/load_config.cc b/src/core/config/load_config.cc similarity index 98% rename from src/core/lib/config/load_config.cc rename to src/core/config/load_config.cc index afceacc7e4..133b78e266 100644 --- a/src/core/lib/config/load_config.cc +++ b/src/core/config/load_config.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/config/load_config.h" +#include "src/core/config/load_config.h" #include #include diff --git a/src/core/lib/config/load_config.h b/src/core/config/load_config.h similarity index 92% rename from src/core/lib/config/load_config.h rename to src/core/config/load_config.h index c0a1fe486c..80a300f885 100644 --- a/src/core/lib/config/load_config.h +++ b/src/core/config/load_config.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H -#define GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H +#ifndef GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H +#define GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H #include #include @@ -51,4 +51,4 @@ std::string LoadConfig(const absl::Flag>& flag, } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H +#endif // GRPC_SRC_CORE_CONFIG_LOAD_CONFIG_H 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 8d5e559e7a..dd983bcbcf 100644 --- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc @@ -26,9 +26,9 @@ #include "absl/log/log.h" #include "absl/strings/string_view.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/promise/context.h" 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 968386bec8..32360fff51 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 @@ -28,9 +28,9 @@ #include "absl/random/random.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/closure.h" @@ -220,7 +220,7 @@ ArenaPromise LegacyChannelIdleFilter::MakeCallPromise( return ArenaPromise( [decrementer = Decrementer(this), next = next_promise_factory(std::move(call_args))]() mutable - -> Poll { return next(); }); + -> Poll { return next(); }); } bool LegacyChannelIdleFilter::StartTransportOp(grpc_transport_op* op) { 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 72429fea9d..6c71ab8e2d 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc +++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -35,10 +35,10 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/sleep.h" diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h index f2c4769ccc..7c9928d3d5 100644 --- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h +++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h @@ -28,8 +28,8 @@ #include #include "absl/strings/string_view.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc index 61a6a84a64..f22079c97d 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc @@ -22,9 +22,9 @@ #include "absl/log/check.h" #include "absl/strings/str_cat.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/context/security_context.h" diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h index 36637d580b..53fc64a3bd 100644 --- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h +++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h @@ -25,8 +25,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc index 924a54d469..c101c361eb 100644 --- a/src/core/ext/filters/http/client_authority_filter.cc +++ b/src/core/ext/filters/http/client_authority_filter.cc @@ -27,8 +27,8 @@ #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc index b791e454b3..a684ef0fc9 100644 --- a/src/core/ext/filters/http/http_filters_plugin.cc +++ b/src/core/ext/filters/http/http_filters_plugin.cc @@ -19,12 +19,12 @@ #include #include "absl/strings/match.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/http/client/http_client_filter.h" #include "src/core/ext/filters/http/message_compress/compression_filter.h" #include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" 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 fe7123db78..002886f6f3 100644 --- a/src/core/ext/filters/http/message_compress/compression_filter.cc +++ b/src/core/ext/filters/http/message_compress/compression_filter.cc @@ -136,8 +136,8 @@ MessageHandle ChannelCompression::CompressMessage( const char* algo_name; const size_t before_size = payload->Length(); const size_t after_size = tmp.Length(); - const float savings_ratio = 1.0f - static_cast(after_size) / - static_cast(before_size); + const float savings_ratio = 1.0f - (static_cast(after_size) / + static_cast(before_size)); CHECK(grpc_compression_algorithm_name(algorithm, &algo_name)); LOG(INFO) << absl::StrFormat( "Compressed[%s] %" PRIuPTR " bytes vs. %" PRIuPTR 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 813cd04dbf..16c17bf77d 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -26,9 +26,9 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/activity.h" #include "src/core/lib/promise/context.h" 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 ff6dc5837d..968901f9fe 100644 --- a/src/core/ext/filters/message_size/message_size_filter.h +++ b/src/core/ext/filters/message_size/message_size_filter.h @@ -26,10 +26,10 @@ #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/transport.h" #include "src/core/service_config/service_config_parser.h" diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc index 0385b865c7..270548aa5a 100644 --- a/src/core/ext/filters/rbac/rbac_filter.cc +++ b/src/core/ext/filters/rbac/rbac_filter.cc @@ -24,10 +24,10 @@ #include #include "absl/status/status.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/promise.h" diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc index 5c1fce9748..c802d8d791 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc @@ -353,6 +353,13 @@ void RbacConfig::RbacPolicy::Rules::Policy::HeaderMatch::JsonPostLoad( range_match->end, invert_match)); return; } + auto string_match = LoadJsonObjectField( + json.object(), args, "stringMatch", errors, /*required=*/false); + if (string_match.has_value()) { + matcher = HeaderMatcher::CreateFromStringMatcher( + name, std::move(string_match->matcher), invert_match); + return; + } if (errors->size() == original_error_size) { errors->AddError("no valid matcher found"); } @@ -390,7 +397,8 @@ void RbacConfig::RbacPolicy::Rules::Policy::StringMatch::JsonPostLoad( field_name, errors, /*required=*/false); if (match.has_value()) { - set_string_matcher(StringMatcher::Create(type, *match, ignore_case)); + set_string_matcher( + StringMatcher::Create(type, *match, /*case_sensitive=*/!ignore_case)); return true; } return false; @@ -406,7 +414,7 @@ void RbacConfig::RbacPolicy::Rules::Policy::StringMatch::JsonPostLoad( /*required=*/false); if (regex_match.has_value()) { set_string_matcher(StringMatcher::Create(StringMatcher::Type::kSafeRegex, - regex_match->regex, ignore_case)); + regex_match->regex)); return; } if (errors->size() == original_error_size) { diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h index 0bd3bc465e..b62db1bdc2 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.h +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h @@ -26,8 +26,8 @@ #include #include "absl/strings/string_view.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/security/authorization/rbac_policy.h" #include "src/core/service_config/service_config_parser.h" 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 22b3177c08..1deb4b512a 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc +++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc @@ -35,9 +35,9 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/promise/map.h" diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h index 59ee3bd706..e4eec1997a 100644 --- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h +++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h @@ -26,8 +26,8 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/service_config/service_config_parser.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_args.h" diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 0223539a45..5c32f169ee 100644 --- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -42,6 +42,7 @@ #include "src/core/client_channel/client_channel_filter.h" #include "src/core/client_channel/connector.h" #include "src/core/client_channel/subchannel.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_registry.h" @@ -49,7 +50,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.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/iomgr/endpoint.h" @@ -248,8 +248,7 @@ class Chttp2SecureClientChannelFactory : public ClientChannelFactory { ChannelArgs args) { auto* channel_credentials = args.GetObject(); if (channel_credentials == nullptr) { - return absl::InternalError( - "channel credentials missing for secure channel"); + return absl::InternalError("channel credentials missing for channel"); } // Make sure security connector does not already exist in args. if (args.Contains(GRPC_ARG_SECURITY_CONNECTOR)) { @@ -269,8 +268,7 @@ class Chttp2SecureClientChannelFactory : public ClientChannelFactory { /*call_creds=*/nullptr, authority->c_str(), &args); if (subchannel_security_connector == nullptr) { return absl::InternalError(absl::StrFormat( - "Failed to create secure subchannel for secure name '%s'", - *authority)); + "Failed to create subchannel for secure name '%s'", *authority)); } return args.SetObject(std::move(subchannel_security_connector)); } @@ -299,7 +297,7 @@ void FactoryInit() { } // namespace -// Create a secure client channel: +// Create a client channel: // Asynchronously: - resolve target // - connect to it (trying alternatives as presented) // - perform handshakes @@ -308,8 +306,8 @@ grpc_channel* grpc_channel_create(const char* target, const grpc_channel_args* c_args) { grpc_core::ExecCtx exec_ctx; GRPC_TRACE_LOG(api, INFO) - << "grpc_secure_channel_create(target=" << target - << ", creds=" << (void*)creds << ", args=" << (void*)c_args << ")"; + << "grpc_channel_create(target=" << target << ", creds=" << (void*)creds + << ", args=" << (void*)c_args << ")"; grpc_channel* channel = nullptr; grpc_error_handle error; if (creds != nullptr) { @@ -338,7 +336,7 @@ grpc_channel* grpc_channel_create(const char* target, status = static_cast(integer); } channel = grpc_lame_client_channel_create( - target, status, "Failed to create secure client channel"); + target, status, "Failed to create client channel"); } return channel; } diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index 0486f7e3bf..3358d18503 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -47,6 +47,7 @@ #include "absl/strings/strip.h" #include "absl/types/optional.h" #include "src/core/channelz/channelz.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" @@ -54,11 +55,13 @@ #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.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/event_engine/extensions/supports_fd.h" #include "src/core/lib/event_engine/query_extensions.h" +#include "src/core/lib/event_engine/resolved_address_internal.h" +#include "src/core/lib/event_engine/tcp_socket_utils.h" +#include "src/core/lib/event_engine/utils.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/event_engine_shims/endpoint.h" @@ -113,7 +116,8 @@ using AcceptorPtr = std::unique_ptr; class Chttp2ServerListener : public Server::ListenerInterface { public: - static grpc_error_handle Create(Server* server, grpc_resolved_address* addr, + static grpc_error_handle Create(Server* server, + const EventEngine::ResolvedAddress& addr, const ChannelArgs& args, Chttp2ServerArgsModifier args_modifier, int* port_num); @@ -627,8 +631,10 @@ void Chttp2ServerListener::ActiveConnection::SendGoAway() { } if (transport != nullptr) { grpc_transport_op* op = grpc_make_transport_op(nullptr); - op->goaway_error = - GRPC_ERROR_CREATE("Server is stopping to serve requests."); + // Set an HTTP2 error of NO_ERROR to do graceful GOAWAYs. + op->goaway_error = grpc_error_set_int( + GRPC_ERROR_CREATE("Server is stopping to serve requests."), + StatusIntProperty::kHttp2Error, GRPC_HTTP2_NO_ERROR); transport->PerformOp(op); } } @@ -701,8 +707,9 @@ void Chttp2ServerListener::ActiveConnection::OnDrainGraceTimeExpiry() { // grpc_error_handle Chttp2ServerListener::Create( - Server* server, grpc_resolved_address* addr, const ChannelArgs& args, - Chttp2ServerArgsModifier args_modifier, int* port_num) { + Server* server, const EventEngine::ResolvedAddress& addr, + const ChannelArgs& args, Chttp2ServerArgsModifier args_modifier, + int* port_num) { // Create Chttp2ServerListener. OrphanablePtr listener = MakeOrphanable(server, args, args_modifier, @@ -714,18 +721,24 @@ grpc_error_handle Chttp2ServerListener::Create( &listener->tcp_server_shutdown_complete_, ChannelArgsEndpointConfig(args), OnAccept, listener.get(), &listener->tcp_server_); if (!error.ok()) return error; + // TODO(yijiem): remove this conversion when we remove all + // grpc_resolved_address usages. + grpc_resolved_address iomgr_addr = + grpc_event_engine::experimental::CreateGRPCResolvedAddress(addr); if (listener->config_fetcher_ != nullptr) { - listener->resolved_address_ = *addr; + listener->resolved_address_ = iomgr_addr; // TODO(yashykt): Consider binding so as to be able to return the port // number. } else { - error = grpc_tcp_server_add_port(listener->tcp_server_, addr, port_num); + error = + grpc_tcp_server_add_port(listener->tcp_server_, &iomgr_addr, port_num); if (!error.ok()) return error; } // Create channelz node. if (args.GetBool(GRPC_ARG_ENABLE_CHANNELZ) .value_or(GRPC_ENABLE_CHANNELZ_DEFAULT)) { - auto string_address = grpc_sockaddr_to_uri(addr); + auto string_address = + grpc_event_engine::experimental::ResolvedAddressToURI(addr); if (!string_address.ok()) { return GRPC_ERROR_CREATE(string_address.status().ToString()); } @@ -955,37 +968,68 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr, args_modifier); } *port_num = -1; - absl::StatusOr> resolved_or; + absl::StatusOr> resolved; + absl::StatusOr> results = + std::vector(); std::vector error_list; std::string parsed_addr = URI::PercentDecode(addr); absl::string_view parsed_addr_unprefixed{parsed_addr}; // Using lambda to avoid use of goto. grpc_error_handle error = [&]() { grpc_error_handle error; + // TODO(ladynana, yijiem): this code does not handle address URIs correctly: + // it's parsing `unix://foo/bar` as path `/foo/bar` when it should be + // parsing it as authority `foo` and path `/bar`. Also add API documentation + // on the valid URIs that grpc_server_add_http2_port accepts. if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixUriPrefix)) { - resolved_or = grpc_resolve_unix_domain_address(parsed_addr_unprefixed); + resolved = grpc_resolve_unix_domain_address(parsed_addr_unprefixed); + GRPC_RETURN_IF_ERROR(resolved.status()); } else if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixAbstractUriPrefix)) { - resolved_or = + resolved = grpc_resolve_unix_abstract_domain_address(parsed_addr_unprefixed); + GRPC_RETURN_IF_ERROR(resolved.status()); } else if (absl::ConsumePrefix(&parsed_addr_unprefixed, kVSockUriPrefix)) { - resolved_or = grpc_resolve_vsock_address(parsed_addr_unprefixed); + resolved = grpc_resolve_vsock_address(parsed_addr_unprefixed); + GRPC_RETURN_IF_ERROR(resolved.status()); } else { - resolved_or = - GetDNSResolver()->LookupHostnameBlocking(parsed_addr, "https"); + if (IsEventEngineDnsNonClientChannelEnabled()) { + absl::StatusOr> ee_resolver = + args.GetObjectRef()->GetDNSResolver( + EventEngine::DNSResolver::ResolverOptions()); + GRPC_RETURN_IF_ERROR(ee_resolver.status()); + results = grpc_event_engine::experimental::LookupHostnameBlocking( + ee_resolver->get(), parsed_addr, "https"); + } else { + // TODO(yijiem): Remove this after event_engine_dns_non_client_channel + // is fully enabled. + absl::StatusOr> iomgr_results = + GetDNSResolver()->LookupHostnameBlocking(parsed_addr, "https"); + GRPC_RETURN_IF_ERROR(iomgr_results.status()); + for (const auto& addr : *iomgr_results) { + results->push_back( + grpc_event_engine::experimental::CreateResolvedAddress(addr)); + } + } } - if (!resolved_or.ok()) { - return absl_status_to_grpc_error(resolved_or.status()); + if (resolved.ok()) { + for (const auto& addr : *resolved) { + results->push_back( + grpc_event_engine::experimental::CreateResolvedAddress(addr)); + } } + GRPC_RETURN_IF_ERROR(results.status()); // Create a listener for each resolved address. - for (auto& addr : *resolved_or) { + for (EventEngine::ResolvedAddress& addr : *results) { // If address has a wildcard port (0), use the same port as a previous // listener. - if (*port_num != -1 && grpc_sockaddr_get_port(&addr) == 0) { - grpc_sockaddr_set_port(&addr, *port_num); + if (*port_num != -1 && + grpc_event_engine::experimental::ResolvedAddressGetPort(addr) == 0) { + grpc_event_engine::experimental::ResolvedAddressSetPort(addr, + *port_num); } int port_temp = -1; - error = Chttp2ServerListener::Create(server, &addr, args, args_modifier, + error = Chttp2ServerListener::Create(server, addr, args, args_modifier, &port_temp); if (!error.ok()) { error_list.push_back(error); @@ -997,17 +1041,17 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr, } } } - if (error_list.size() == resolved_or->size()) { + if (error_list.size() == results->size()) { std::string msg = absl::StrFormat( "No address added out of total %" PRIuPTR " resolved for '%s'", - resolved_or->size(), addr); + results->size(), addr); return GRPC_ERROR_CREATE_REFERENCING(msg.c_str(), error_list.data(), error_list.size()); } else if (!error_list.empty()) { - std::string msg = absl::StrFormat( - "Only %" PRIuPTR " addresses added out of total %" PRIuPTR - " resolved", - resolved_or->size() - error_list.size(), resolved_or->size()); + std::string msg = + absl::StrFormat("Only %" PRIuPTR + " addresses added out of total %" PRIuPTR " resolved", + results->size() - error_list.size(), results->size()); error = GRPC_ERROR_CREATE_REFERENCING(msg.c_str(), error_list.data(), error_list.size()); LOG(INFO) << "WARNING: " << StatusToString(error); diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc index d996de7315..ef627e60d0 100644 --- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc @@ -96,7 +96,7 @@ size_t grpc_chttp2_base64_infer_length_after_decode(const grpc_slice& slice) { << " (without padding), which is invalid.\n"; return 0; } - return tuples * 3 + tail_xtra[tail_case]; + return (tuples * 3) + tail_xtra[tail_case]; } bool grpc_base64_decode_partial(struct grpc_base64_decode_context* ctx) { @@ -215,7 +215,8 @@ grpc_slice grpc_chttp2_base64_decode_with_length(const grpc_slice& input, 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"; + << ((input_length / 4 * 3) + tail_xtra[input_length % 4]) + << ".\n"; grpc_core::CSliceUnref(output); return grpc_empty_slice(); } diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.cc b/src/core/ext/transport/chttp2/transport/bin_encoder.cc index 8a6b3670ce..c9727428eb 100644 --- a/src/core/ext/transport/chttp2/transport/bin_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/bin_encoder.cc @@ -51,7 +51,7 @@ grpc_slice grpc_chttp2_base64_encode(const grpc_slice& input) { size_t input_length = GRPC_SLICE_LENGTH(input); size_t input_triplets = input_length / 3; size_t tail_case = input_length % 3; - size_t output_length = input_triplets * 4 + tail_xtra[tail_case]; + size_t output_length = (input_triplets * 4) + tail_xtra[tail_case]; grpc_slice output = GRPC_SLICE_MALLOC(output_length); const uint8_t* in = GRPC_SLICE_START_PTR(input); char* out = reinterpret_cast GRPC_SLICE_START_PTR(output); @@ -171,9 +171,9 @@ grpc_slice grpc_chttp2_base64_encode_and_huffman_compress( size_t input_length = GRPC_SLICE_LENGTH(input); size_t input_triplets = input_length / 3; size_t tail_case = input_length % 3; - size_t output_syms = input_triplets * 4 + tail_xtra[tail_case]; + size_t output_syms = (input_triplets * 4) + tail_xtra[tail_case]; size_t max_output_bits = 11 * output_syms; - size_t max_output_length = max_output_bits / 8 + (max_output_bits % 8 != 0); + size_t max_output_length = (max_output_bits / 8) + (max_output_bits % 8 != 0); grpc_slice output = GRPC_SLICE_MALLOC(max_output_length); const uint8_t* in = GRPC_SLICE_START_PTR(input); uint8_t* start_out = GRPC_SLICE_START_PTR(output); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 61c560e0d2..0738d371fb 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -54,12 +55,14 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/variant.h" +#include "src/core/config/config_vars.h" #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" #include "src/core/ext/transport/chttp2/transport/context_list_entry.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/frame_data.h" #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" +#include "src/core/ext/transport/chttp2/transport/frame_security.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/http2_settings.h" #include "src/core/ext/transport/chttp2/transport/internal.h" @@ -71,7 +74,6 @@ #include "src/core/ext/transport/chttp2/transport/varint.h" #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/config_vars.h" #include "src/core/lib/event_engine/extensions/tcp_trace.h" #include "src/core/lib/event_engine/query_extensions.h" #include "src/core/lib/experiments/experiments.h" @@ -98,6 +100,7 @@ #include "src/core/lib/transport/metadata_info.h" #include "src/core/lib/transport/status_conversion.h" #include "src/core/lib/transport/transport.h" +#include "src/core/lib/transport/transport_framing_endpoint_extension.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/stats.h" #include "src/core/telemetry/stats_data.h" @@ -467,7 +470,7 @@ static void read_channel_args(grpc_chttp2_transport* t, .value_or(std::max(t->keepalive_timeout * 2, grpc_core::Duration::Minutes(1))); - // Only send the prefered rx frame size http2 setting if we are instructed + // Only send the preferred rx frame size http2 setting if we are instructed // to auto size the buffers allocated at tcp level and we also can adjust // sending frame size. t->enable_preferred_rx_crypto_frame_advertisement = @@ -548,6 +551,9 @@ static void read_channel_args(grpc_chttp2_transport* t, t->settings.mutable_local().SetPreferredReceiveCryptoMessageSize(INT_MAX); } + t->settings.mutable_local().SetAllowSecurityFrame( + channel_args.GetBool(GRPC_ARG_SECURITY_FRAME_ALLOWED).value_or(false)); + t->ping_on_rst_stream_percent = grpc_core::Clamp( channel_args.GetInt(GRPC_ARG_HTTP2_PING_ON_RST_STREAM_PERCENT) .value_or(1), @@ -556,6 +562,10 @@ static void read_channel_args(grpc_chttp2_transport* t, t->max_concurrent_streams_overload_protection = channel_args.GetBool(GRPC_ARG_MAX_CONCURRENT_STREAMS_OVERLOAD_PROTECTION) .value_or(true); + + t->max_concurrent_streams_reject_on_client = + channel_args.GetBool(GRPC_ARG_MAX_CONCURRENT_STREAMS_REJECT_ON_CLIENT) + .value_or(false); } static void init_keepalive_pings_if_enabled_locked( @@ -577,6 +587,35 @@ static void init_keepalive_pings_if_enabled_locked( } } +// TODO(alishananda): add unit testing as part of chttp2 promise conversion work +void grpc_chttp2_transport::WriteSecurityFrame(grpc_core::SliceBuffer* data) { + combiner->Run(grpc_core::NewClosure( + [transport = Ref(), data](grpc_error_handle) mutable { + transport->WriteSecurityFrameLocked(data); + }), + absl::OkStatus()); +} + +void grpc_chttp2_transport::WriteSecurityFrameLocked( + grpc_core::SliceBuffer* data) { + if (data == nullptr) { + return; + } + if (!settings.peer().allow_security_frame()) { + close_transport_locked( + this, + grpc_error_set_int( + GRPC_ERROR_CREATE("Unexpected SECURITY frame scheduled for write"), + grpc_core::StatusIntProperty::kRpcStatus, + GRPC_STATUS_FAILED_PRECONDITION)); + } + grpc_core::SliceBuffer security_frame; + grpc_chttp2_security_frame_create(data->c_slice_buffer(), data->Length(), + security_frame.c_slice_buffer()); + grpc_slice_buffer_move_into(security_frame.c_slice_buffer(), &qbuf); + grpc_chttp2_initiate_write(this, GRPC_CHTTP2_INITIATE_WRITE_SEND_MESSAGE); +} + using grpc_event_engine::experimental::QueryExtension; using grpc_event_engine::experimental::TcpTraceExtension; @@ -619,6 +658,17 @@ grpc_chttp2_transport::grpc_chttp2_transport( } } + if (channel_args.GetBool(GRPC_ARG_SECURITY_FRAME_ALLOWED).value_or(false)) { + transport_framing_endpoint_extension = QueryExtension< + grpc_core::TransportFramingEndpointExtension>( + grpc_event_engine::experimental::grpc_get_wrapped_event_engine_endpoint( + ep.get())); + if (transport_framing_endpoint_extension != nullptr) { + transport_framing_endpoint_extension->SetSendFrameCallback( + [this](grpc_core::SliceBuffer* data) { WriteSecurityFrame(data); }); + } + } + CHECK(strlen(GRPC_CHTTP2_CLIENT_CONNECT_STRING) == GRPC_CHTTP2_CLIENT_CONNECT_STRLEN); @@ -1041,8 +1091,8 @@ static void write_action(grpc_chttp2_transport* t) { // to nullptr. cl = nullptr; } - // Choose max_frame_size as the prefered rx crypto frame size indicated by the - // peer. + // Choose max_frame_size as the preferred rx crypto frame size indicated by + // the peer. int max_frame_size = t->settings.peer().preferred_receive_crypto_message_size(); // Note: max frame size is 0 if the remote peer does not support adjusting the @@ -1381,8 +1431,24 @@ static void send_initial_metadata_locked( if (t->is_client) { if (t->closed_with_error.ok()) { CHECK_EQ(s->id, 0u); - grpc_chttp2_list_add_waiting_for_concurrency(t, s); - maybe_start_some_streams(t); + if (t->max_concurrent_streams_reject_on_client && + t->stream_map.size() >= + t->settings.peer().max_concurrent_streams()) { + s->trailing_metadata_buffer.Set( + grpc_core::GrpcStreamNetworkState(), + grpc_core::GrpcStreamNetworkState::kNotSentOnWire); + grpc_chttp2_cancel_stream( + t, s, + grpc_error_set_int( + GRPC_ERROR_CREATE_REFERENCING("Too many streams", + &t->closed_with_error, 1), + grpc_core::StatusIntProperty::kRpcStatus, + GRPC_STATUS_RESOURCE_EXHAUSTED), + false); + } else { + grpc_chttp2_list_add_waiting_for_concurrency(t, s); + maybe_start_some_streams(t); + } } else { s->trailing_metadata_buffer.Set( grpc_core::GrpcStreamNetworkState(), @@ -1425,7 +1491,7 @@ static void send_message_locked( op->payload->send_message.send_message->Length()); on_complete->next_data.scratch |= t->closure_barrier_may_cover_write; s->send_message_finished = add_closure_barrier(op->on_complete); - const uint32_t flags = op_payload->send_message.flags; + uint32_t flags = 0; if (s->write_closed) { op->payload->send_message.stream_write_closed = true; // We should NOT return an error here, so as to avoid a cancel OP being @@ -1435,6 +1501,19 @@ static void send_message_locked( absl::OkStatus(), "fetching_send_message_finished"); } else { + // Buffer hint is used to buffer the message in the transport until the + // write buffer size (specified through GRPC_ARG_HTTP2_WRITE_BUFFER_SIZE) is + // reached. This is to batch writes sent down to tcp. However, if the memory + // pressure is high, disable the buffer hint to flush data down to tcp as + // soon as possible to avoid OOM. + if (grpc_core::IsDisableBufferHintOnHighMemoryPressureEnabled() && + t->memory_owner.GetPressureInfo().pressure_control_value >= 0.8) { + // Disable write buffer hint if memory pressure is high. The value of 0.8 + // is chosen to match the threshold used by the tcp endpoint (in + // allocating memory for socket reads). + op_payload->send_message.flags &= ~GRPC_WRITE_BUFFER_HINT; + } + flags = op_payload->send_message.flags; uint8_t* frame_hdr = grpc_slice_buffer_tiny_add(&s->flow_controlled_buffer, GRPC_HEADER_SIZE_IN_BYTES); frame_hdr[0] = (flags & GRPC_WRITE_INTERNAL_COMPRESS) != 0; diff --git a/src/core/ext/transport/chttp2/transport/decode_huff.h b/src/core/ext/transport/chttp2/transport/decode_huff.h index 21f087585c..555c2da268 100644 --- a/src/core/ext/transport/chttp2/transport/decode_huff.h +++ b/src/core/ext/transport/chttp2/transport/decode_huff.h @@ -87,7 +87,7 @@ class HuffDecoderCommon { return table1_emit_[i >> 6][emit]; } static inline uint64_t GetOp13(size_t i) { - return table13_0_inner_[(i < 3 ? (i) : ((i - 3) / 12 + 3))]; + return table13_0_inner_[(i < 3 ? (i) : (((i - 3) / 12) + 3))]; } static inline uint64_t GetEmit13(size_t, size_t emit) { return (emit < 1 ? (((void)emit, 92)) : ((emit - 1) ? 208 : 195)); @@ -189,7 +189,7 @@ class HuffDecoderCommon { } static inline uint64_t GetEmit37(size_t, size_t emit) { return emit + 236; } static inline uint64_t GetOp36(size_t i) { - return table36_0_inner_[(i < 3 ? (i / 2 + 0) : ((i - 3) + 1))]; + return table36_0_inner_[(i < 3 ? ((i / 2) + 0) : ((i - 3) + 1))]; } static inline uint64_t GetEmit36(size_t, size_t emit) { return table36_0_emit_[emit]; diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc index b65ab0e12a..59755e4d52 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -182,7 +182,7 @@ TransportFlowControl::TargetInitialWindowSizeBasedOnMemoryPressureAndBdp() // and a value t such that t_min <= t <= t_max, return the value on the line // segment at t. auto lerp = [](double t, double t_min, double t_max, double a, double b) { - return a + (b - a) * (t - t_min) / (t_max - t_min); + return a + ((b - a) * (t - t_min) / (t_max - t_min)); }; // We split memory pressure into three broad regions: // 1. Low memory pressure, the "anything goes" case - we assume no memory @@ -295,7 +295,7 @@ FlowControlAction TransportFlowControl::PeriodicUpdate() { // Advertise PREFERRED_RECEIVE_CRYPTO_FRAME_SIZE to peer. By advertising // PREFERRED_RECEIVE_CRYPTO_FRAME_SIZE to the peer, we are informing the // peer that we have tcp frame size tuning enabled and we inform it of our - // prefered rx frame sizes. The prefered rx frame size is determined as: + // preferred rx frame sizes. The preferred rx frame size is determined as: // Clamp(target_frame_size_ * 2, 16384, 0x7fffffff). In the future, this // maybe updated to a different function of the memory pressure. UpdateSetting( diff --git a/src/core/ext/transport/chttp2/transport/frame.cc b/src/core/ext/transport/chttp2/transport/frame.cc index cd9093f94a..2545eb356d 100644 --- a/src/core/ext/transport/chttp2/transport/frame.cc +++ b/src/core/ext/transport/chttp2/transport/frame.cc @@ -38,6 +38,7 @@ constexpr uint8_t kFrameTypePing = 6; constexpr uint8_t kFrameTypeGoaway = 7; constexpr uint8_t kFrameTypeWindowUpdate = 8; constexpr uint8_t kFrameTypePushPromise = 5; +constexpr uint8_t kFrameTypeSecurity = 200; constexpr uint8_t kFlagEndStream = 1; constexpr uint8_t kFlagAck = 1; @@ -122,6 +123,7 @@ class SerializeExtraBytesRequired { size_t operator()(const Http2PingFrame&) { return 8; } size_t operator()(const Http2GoawayFrame&) { return 8; } size_t operator()(const Http2WindowUpdateFrame&) { return 4; } + size_t operator()(const Http2SecurityFrame&) { return 0; } size_t operator()(const Http2UnknownFrame&) { Crash("unreachable"); } }; @@ -218,6 +220,15 @@ class SerializeHeaderAndPayload { out_.AppendIndexed(Slice(std::move(hdr_and_payload))); } + void operator()(Http2SecurityFrame& frame) { + auto hdr = extra_bytes_.TakeFirst(kFrameHeaderSize); + Http2FrameHeader{static_cast(frame.payload.Length()), + kFrameTypeSecurity, 0, 0} + .Serialize(hdr.begin()); + out_.AppendIndexed(Slice(std::move(hdr))); + out_.TakeAndAppend(frame.payload); + } + void operator()(Http2UnknownFrame&) { Crash("unreachable"); } private: @@ -415,6 +426,11 @@ absl::StatusOr ParseWindowUpdateFrame( return Http2WindowUpdateFrame{hdr.stream_id, Read4b(buffer)}; } +absl::StatusOr ParseSecurityFrame( + const Http2FrameHeader& /*hdr*/, SliceBuffer& payload) { + return Http2SecurityFrame{std::move(payload)}; +} + } // namespace void Http2FrameHeader::Serialize(uint8_t* output) const { @@ -447,6 +463,8 @@ std::string Http2FrameTypeString(uint8_t frame_type) { return "WINDOW_UPDATE"; case kFrameTypePing: return "PING"; + case kFrameTypeSecurity: + return "SECURITY"; } return absl::StrCat("UNKNOWN(", frame_type, ")"); } @@ -495,6 +513,8 @@ absl::StatusOr ParseFramePayload(const Http2FrameHeader& hdr, return absl::InternalError( "push promise not supported (and SETTINGS_ENABLE_PUSH explicitly " "disabled)."); + case kFrameTypeSecurity: + return ParseSecurityFrame(hdr, payload); default: return Http2UnknownFrame{}; } diff --git a/src/core/ext/transport/chttp2/transport/frame.h b/src/core/ext/transport/chttp2/transport/frame.h index ccefc083f9..8a91d9e1df 100644 --- a/src/core/ext/transport/chttp2/transport/frame.h +++ b/src/core/ext/transport/chttp2/transport/frame.h @@ -151,6 +151,15 @@ struct Http2WindowUpdateFrame { } }; +// Security-related frame +struct Http2SecurityFrame { + SliceBuffer payload; + + bool operator==(const Http2SecurityFrame& other) const { + return payload.JoinIntoString() == other.payload.JoinIntoString(); + } +}; + // Type of frame was unknown (and should be ignored) struct Http2UnknownFrame { bool operator==(const Http2UnknownFrame&) const { return true; } @@ -164,7 +173,8 @@ struct Http2UnknownFrame { using Http2Frame = absl::variant; + Http2GoawayFrame, Http2WindowUpdateFrame, Http2SecurityFrame, + Http2UnknownFrame>; /////////////////////////////////////////////////////////////////////////////// // Frame header diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc index d03e47fa71..1ec015abec 100644 --- a/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -84,13 +84,16 @@ grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( grpc_slice_buffer* slices = &s->frame_storage; grpc_error_handle error; - if (slices->length < 5) { - if (min_progress_size != nullptr) *min_progress_size = 5 - slices->length; + if (slices->length < GRPC_HEADER_SIZE_IN_BYTES) { + if (min_progress_size != nullptr) { + *min_progress_size = GRPC_HEADER_SIZE_IN_BYTES - slices->length; + } return grpc_core::Pending{}; } - uint8_t header[5]; - grpc_slice_buffer_copy_first_into_buffer(slices, 5, header); + uint8_t header[GRPC_HEADER_SIZE_IN_BYTES]; + grpc_slice_buffer_copy_first_into_buffer(slices, GRPC_HEADER_SIZE_IN_BYTES, + header); switch (header[0]) { case 0: @@ -114,9 +117,9 @@ grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( (static_cast(header[3]) << 8) | static_cast(header[4]); - if (slices->length < length + 5) { + if (slices->length < length + GRPC_HEADER_SIZE_IN_BYTES) { if (min_progress_size != nullptr) { - *min_progress_size = length + 5 - slices->length; + *min_progress_size = length + GRPC_HEADER_SIZE_IN_BYTES - slices->length; } return grpc_core::Pending{}; } @@ -124,8 +127,10 @@ grpc_core::Poll grpc_deframe_unprocessed_incoming_frames( if (min_progress_size != nullptr) *min_progress_size = 0; if (stream_out != nullptr) { - s->call_tracer_wrapper.RecordIncomingBytes({5, length, 0}); - grpc_slice_buffer_move_first_into_buffer(slices, 5, header); + s->call_tracer_wrapper.RecordIncomingBytes( + {GRPC_HEADER_SIZE_IN_BYTES, length, 0}); + grpc_slice_buffer_move_first_into_buffer(slices, GRPC_HEADER_SIZE_IN_BYTES, + header); grpc_slice_buffer_move_first(slices, length, stream_out->c_slice_buffer()); } diff --git a/src/core/ext/transport/chttp2/transport/frame_security.cc b/src/core/ext/transport/chttp2/transport/frame_security.cc new file mode 100644 index 0000000000..08a8b80089 --- /dev/null +++ b/src/core/ext/transport/chttp2/transport/frame_security.cc @@ -0,0 +1,82 @@ +// +// 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/ext/transport/chttp2/transport/frame_security.h" + +#include +#include + +#include "absl/status/status.h" +#include "src/core/ext/transport/chttp2/transport/internal.h" +#include "src/core/ext/transport/chttp2/transport/legacy_frame.h" +#include "src/core/lib/iomgr/event_engine_shims/endpoint.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/slice/slice_buffer.h" +#include "src/core/lib/transport/transport_framing_endpoint_extension.h" + +absl::Status grpc_chttp2_security_frame_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* /*s*/, + const grpc_slice& slice, + int is_last) { + // Ignore frames from non-EventEngine endpoints. + if (t->transport_framing_endpoint_extension == nullptr) { + return absl::OkStatus(); + } + + grpc_chttp2_security_frame_parser* p = + static_cast(parser); + p->payload.Append(grpc_core::Slice(slice)); + + if (is_last) { + // Send security frame payload to endpoint. + t->transport_framing_endpoint_extension->ReceiveFrame( + std::move(p->payload)); + } + + return absl::OkStatus(); +} + +absl::Status grpc_chttp2_security_frame_parser_begin_frame( + grpc_chttp2_security_frame_parser* parser) { + parser->payload.Clear(); + return absl::OkStatus(); +} + +void grpc_chttp2_security_frame_create(grpc_slice_buffer* payload, + uint32_t length, + grpc_slice_buffer* frame) { + // does this frame need padding for security? + // do we need to worry about max frame size? it's 16 bytes + grpc_slice hdr; + uint8_t* p; + static const size_t header_size = 9; + + hdr = GRPC_SLICE_MALLOC(header_size); + p = GRPC_SLICE_START_PTR(hdr); + *p++ = static_cast(length >> 16); + *p++ = static_cast(length >> 8); + *p++ = static_cast(length); + *p++ = GRPC_CHTTP2_FRAME_SECURITY; + *p++ = 0; // no flags + *p++ = 0; + *p++ = 0; + *p++ = 0; + *p++ = 0; + + grpc_slice_buffer_add(frame, hdr); + grpc_slice_buffer_move_first_no_ref(payload, payload->length, frame); +} diff --git a/src/core/ext/transport/chttp2/transport/frame_security.h b/src/core/ext/transport/chttp2/transport/frame_security.h new file mode 100644 index 0000000000..ea6e81f974 --- /dev/null +++ b/src/core/ext/transport/chttp2/transport/frame_security.h @@ -0,0 +1,44 @@ +// +// 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_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SECURITY_H +#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SECURITY_H + +#include +#include +#include + +#include "src/core/ext/transport/chttp2/transport/legacy_frame.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/slice/slice_buffer.h" +#include "src/core/lib/transport/transport_framing_endpoint_extension.h" + +struct grpc_chttp2_security_frame_parser { + grpc_core::SliceBuffer payload; +}; + +void grpc_chttp2_security_frame_create(grpc_slice_buffer* payload, + uint32_t length, + grpc_slice_buffer* frame); + +absl::Status grpc_chttp2_security_frame_parser_begin_frame( + grpc_chttp2_security_frame_parser* parser); + +grpc_error_handle grpc_chttp2_security_frame_parser_parse( + void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, + const grpc_slice& slice, int is_last); + +#endif // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SECURITY_H diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc index 84dafd7382..22661848f8 100644 --- a/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -36,6 +36,7 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice.h" +#include "src/core/telemetry/stats.h" #include "src/core/util/debug_location.h" #include "src/core/util/useful.h" @@ -100,6 +101,21 @@ grpc_error_handle grpc_chttp2_settings_parser_parse(void* p, if (cur == end) { parser->state = GRPC_CHTTP2_SPS_ID0; if (is_last) { + grpc_core::Http2Settings* target_settings = + parser->incoming_settings.get(); + grpc_core::global_stats().IncrementHttp2HeaderTableSize( + target_settings->header_table_size()); + grpc_core::global_stats().IncrementHttp2InitialWindowSize( + target_settings->initial_window_size()); + grpc_core::global_stats().IncrementHttp2MaxConcurrentStreams( + target_settings->max_concurrent_streams()); + grpc_core::global_stats().IncrementHttp2MaxFrameSize( + target_settings->max_frame_size()); + grpc_core::global_stats().IncrementHttp2MaxHeaderListSize( + target_settings->max_header_list_size()); + grpc_core::global_stats() + .IncrementHttp2PreferredReceiveCryptoMessageSize( + target_settings->preferred_receive_crypto_message_size()); *parser->target_settings = *parser->incoming_settings; t->num_pending_induced_frames++; grpc_slice_buffer_add(&t->qbuf, grpc_chttp2_settings_ack_create()); 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 47db0a0394..92ad73d901 100644 --- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -29,6 +29,8 @@ #include "src/core/ext/transport/chttp2/transport/flow_control.h" #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/stream_lists.h" +#include "src/core/telemetry/stats.h" +#include "src/core/util/time.h" grpc_slice grpc_chttp2_window_update_create( uint32_t id, uint32_t window_delta, @@ -101,9 +103,17 @@ grpc_error_handle grpc_chttp2_window_update_parser_parse( if (t->incoming_stream_id != 0) { if (s != nullptr) { + grpc_core::Timestamp now = grpc_core::Timestamp::Now(); + if (s->last_window_update_time != grpc_core::Timestamp::InfPast()) { + grpc_core::global_stats().IncrementHttp2StreamWindowUpdatePeriod( + (now - s->last_window_update_time).millis()); + } + s->last_window_update_time = now; grpc_core::chttp2::StreamFlowControl::OutgoingUpdateContext( &s->flow_control) .RecvUpdate(received_update); + grpc_core::global_stats().IncrementHttp2StreamRemoteWindowUpdate( + received_update); if (grpc_chttp2_list_remove_stalled_by_stream(t, s)) { grpc_chttp2_mark_stream_writable(t, s); grpc_chttp2_initiate_write( @@ -113,6 +123,14 @@ grpc_error_handle grpc_chttp2_window_update_parser_parse( } else { grpc_core::chttp2::TransportFlowControl::OutgoingUpdateContext upd( &t->flow_control); + grpc_core::Timestamp now = grpc_core::Timestamp::Now(); + if (t->last_window_update_time != grpc_core::Timestamp::InfPast()) { + grpc_core::global_stats().IncrementHttp2TransportWindowUpdatePeriod( + (now - t->last_window_update_time).millis()); + } + t->last_window_update_time = now; + grpc_core::global_stats().IncrementHttp2TransportRemoteWindowUpdate( + received_update); upd.RecvUpdate(received_update); if (upd.Finish() == grpc_core::chttp2::StallEdge::kUnstalled) { grpc_chttp2_initiate_write( diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 1ae3db3d60..cc17bba759 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -328,7 +328,7 @@ void SliceIndex::EmitTo(absl::string_view key, const Slice& value, for (It it = values_.begin(); it != values_.end(); ++it) { if (value == it->value) { // Got a hit... is it still in the decode table? - if (table.ConvertableToDynamicIndex(it->index)) { + if (table.ConvertibleToDynamicIndex(it->index)) { // Yes, emit the index and proceed to cleanup. encoder->EmitIndexed(table.DynamicIndex(it->index)); } else { @@ -342,7 +342,7 @@ void SliceIndex::EmitTo(absl::string_view key, const Slice& value, // If there are entries at the end of the array, and those entries are no // longer in the table, remove them. while (!values_.empty() && - !table.ConvertableToDynamicIndex(values_.back().index)) { + !table.ConvertibleToDynamicIndex(values_.back().index)) { values_.pop_back(); } // All done, early out. @@ -440,7 +440,7 @@ void Compressor::EncodeWith( void Encoder::EncodeAlwaysIndexed(uint32_t* index, absl::string_view key, Slice value, size_t) { - if (compressor_->table_.ConvertableToDynamicIndex(*index)) { + if (compressor_->table_.ConvertibleToDynamicIndex(*index)) { EmitIndexed(compressor_->table_.DynamicIndex(*index)); } else { *index = EmitLitHdrWithNonBinaryStringKeyIncIdx( @@ -451,7 +451,7 @@ void Encoder::EncodeAlwaysIndexed(uint32_t* index, absl::string_view key, void Encoder::EncodeIndexedKeyWithBinaryValue(uint32_t* index, absl::string_view key, Slice value) { - if (compressor_->table_.ConvertableToDynamicIndex(*index)) { + if (compressor_->table_.ConvertibleToDynamicIndex(*index)) { EmitLitHdrWithBinaryStringKeyNotIdx( compressor_->table_.DynamicIndex(*index), std::move(value)); } else { @@ -478,7 +478,7 @@ void TimeoutCompressorImpl::EncodeWith(absl::string_view key, auto& table = encoder->hpack_table(); for (size_t i = 0; i < kNumPreviousValues; i++) { const auto& previous = previous_timeouts_[i]; - if (!table.ConvertableToDynamicIndex(previous.index)) continue; + if (!table.ConvertibleToDynamicIndex(previous.index)) continue; const double ratio = timeout.RatioVersus(previous.timeout); // If the timeout we're sending is shorter than a previous timeout, but // within 3% of it, we'll consider sending it. diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h index 4695089b01..4fd5b1c08f 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h @@ -103,7 +103,7 @@ class Encoder { // void EncodeWith(MetadataTrait, const MetadataTrait::ValueType, Encoder*); // This method figures out how to encode the value, and then delegates to // Encoder to perform the encoding. -template +template class Compressor; // No compression encoder: just emit the key and value as literals. @@ -173,7 +173,7 @@ class Compressor { Encoder* encoder) { auto& table = encoder->hpack_table(); if (previously_sent_value_ == value && - table.ConvertableToDynamicIndex(previously_sent_index_)) { + table.ConvertibleToDynamicIndex(previously_sent_index_)) { encoder->EmitIndexed(table.DynamicIndex(previously_sent_index_)); return; } @@ -231,7 +231,7 @@ class Compressor> { auto& table = encoder->hpack_table(); if (static_cast(value) < N) { index = &previously_sent_[static_cast(value)]; - if (table.ConvertableToDynamicIndex(*index)) { + if (table.ConvertibleToDynamicIndex(*index)) { encoder->EmitIndexed(table.DynamicIndex(*index)); return; } diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h index f68e2995b2..8a08deedfd 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h +++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h @@ -56,9 +56,9 @@ class HPackEncoderTable { return 1 + hpack_constants::kLastStaticEntry + tail_remote_index_ + table_elems_ - index; } - // Check if an element index is convertable to a dynamic index - // Note that 0 is always not convertable - bool ConvertableToDynamicIndex(uint32_t index) const { + // Check if an element index is convertible to a dynamic index + // Note that 0 is always not convertible + bool ConvertibleToDynamicIndex(uint32_t index) const { return index > tail_remote_index_; } diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 82d249f2ce..4c2227cf5b 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -403,7 +403,7 @@ absl::optional> HPackParser::String::Unbase64Loop( } std::vector out; - out.reserve(3 * (end - cur) / 4 + 3); + out.reserve((3 * (end - cur) / 4) + 3); // Decode 4 bytes at a time while we can while (end - cur >= 4) { diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.cc b/src/core/ext/transport/chttp2/transport/http2_settings.cc index 83bf6e5c5d..1115fb9dfb 100644 --- a/src/core/ext/transport/chttp2/transport/http2_settings.cc +++ b/src/core/ext/transport/chttp2/transport/http2_settings.cc @@ -58,6 +58,9 @@ void Http2Settings::Diff( cb(kGrpcPreferredReceiveCryptoFrameSizeWireId, preferred_receive_crypto_message_size_); } + if (allow_security_frame_ != old.allow_security_frame_) { + cb(kGrpcAllowSecurityFrameWireId, allow_security_frame_); + } } std::string Http2Settings::WireIdToName(uint16_t wire_id) { @@ -78,6 +81,8 @@ std::string Http2Settings::WireIdToName(uint16_t wire_id) { return std::string(allow_true_binary_metadata_name()); case kGrpcPreferredReceiveCryptoFrameSizeWireId: return std::string(preferred_receive_crypto_message_size_name()); + case kGrpcAllowSecurityFrameWireId: + return std::string(allow_security_frame_name()); default: return absl::StrCat("UNKNOWN (", wire_id, ")"); } @@ -119,6 +124,10 @@ grpc_http2_error_code Http2Settings::Apply(uint16_t key, uint32_t value) { Clamp(value, min_preferred_receive_crypto_message_size(), max_preferred_receive_crypto_message_size()); break; + case kGrpcAllowSecurityFrameWireId: + if (value > 1) return GRPC_HTTP2_PROTOCOL_ERROR; + allow_security_frame_ = value != 0; + break; } return GRPC_HTTP2_NO_ERROR; } diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.h b/src/core/ext/transport/chttp2/transport/http2_settings.h index 44ed672d12..dc383ed529 100644 --- a/src/core/ext/transport/chttp2/transport/http2_settings.h +++ b/src/core/ext/transport/chttp2/transport/http2_settings.h @@ -42,6 +42,7 @@ class Http2Settings { kMaxHeaderListSizeWireId = 6, kGrpcAllowTrueBinaryMetadataWireId = 65027, kGrpcPreferredReceiveCryptoFrameSizeWireId = 65028, + kGrpcAllowSecurityFrameWireId = 65029, }; void Diff(bool is_first_send, const Http2Settings& old, @@ -60,6 +61,7 @@ class Http2Settings { bool allow_true_binary_metadata() const { return allow_true_binary_metadata_; } + bool allow_security_frame() const { return allow_security_frame_; } void SetHeaderTableSize(uint32_t x) { header_table_size_ = x; } void SetMaxConcurrentStreams(uint32_t x) { max_concurrent_streams_ = x; } @@ -79,6 +81,7 @@ class Http2Settings { Clamp(x, min_preferred_receive_crypto_message_size(), max_preferred_receive_crypto_message_size()); } + void SetAllowSecurityFrame(bool x) { allow_security_frame_ = x; } static absl::string_view header_table_size_name() { return "HEADER_TABLE_SIZE"; @@ -100,6 +103,9 @@ class Http2Settings { static absl::string_view preferred_receive_crypto_message_size_name() { return "GRPC_PREFERRED_RECEIVE_MESSAGE_SIZE"; } + static absl::string_view allow_security_frame_name() { + return "GRPC_ALLOW_SECURITY_FRAME"; + } static uint32_t max_initial_window_size() { return 2147483647u; } static uint32_t max_max_frame_size() { return 16777215u; } @@ -120,7 +126,8 @@ class Http2Settings { preferred_receive_crypto_message_size_ == rhs.preferred_receive_crypto_message_size_ && enable_push_ == rhs.enable_push_ && - allow_true_binary_metadata_ == rhs.allow_true_binary_metadata_; + allow_true_binary_metadata_ == rhs.allow_true_binary_metadata_ && + allow_security_frame_ == rhs.allow_security_frame_; } bool operator!=(const Http2Settings& rhs) const { return !operator==(rhs); } @@ -134,6 +141,7 @@ class Http2Settings { uint32_t preferred_receive_crypto_message_size_ = 0u; bool enable_push_ = true; bool allow_true_binary_metadata_ = false; + bool allow_security_frame_ = false; }; class Http2SettingsManager { diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index afe319b81a..7336d32322 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -45,6 +45,7 @@ #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" #include "src/core/ext/transport/chttp2/transport/frame_ping.h" #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" +#include "src/core/ext/transport/chttp2/transport/frame_security.h" #include "src/core/ext/transport/chttp2/transport/frame_settings.h" #include "src/core/ext/transport/chttp2/transport/frame_window_update.h" #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" @@ -70,6 +71,7 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/lib/transport/transport_framing_endpoint_extension.h" #include "src/core/telemetry/call_tracer.h" #include "src/core/telemetry/tcp_tracer.h" #include "src/core/util/bitset.h" @@ -255,12 +257,19 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, void SetPollsetSet(grpc_stream* stream, grpc_pollset_set* pollset_set) override; void PerformOp(grpc_transport_op* op) override; + // Callback for transport framing endpoint extension to send security frames + // received directly from the endpoint on wire. + void WriteSecurityFrame(grpc_core::SliceBuffer* data); + void WriteSecurityFrameLocked(grpc_core::SliceBuffer* data); grpc_core::OrphanablePtr ep; grpc_core::Mutex ep_destroy_mu; // Guards endpoint destruction only. grpc_core::Slice peer_string; + grpc_core::TransportFramingEndpointExtension* + transport_framing_endpoint_extension = nullptr; + grpc_core::MemoryOwner memory_owner; const grpc_core::MemoryAllocator::Reservation self_reservation; grpc_core::ReclamationSweep active_reclamation; @@ -397,6 +406,8 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, } simple; /// parser for goaway frames grpc_chttp2_goaway_parser goaway_parser; + // parser for secure frames + grpc_chttp2_security_frame_parser security_frame_parser; grpc_core::chttp2::TransportFlowControl flow_control; /// initial window change. This is tracked as we parse settings frames from @@ -537,11 +548,16 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, /// True if we count stream allocation (instead of HTTP2 concurrency) for /// MAX_CONCURRENT_STREAMS bool max_concurrent_streams_overload_protection = false; + bool max_concurrent_streams_reject_on_client = false; // What percentage of rst_stream frames on the server should cause a ping // frame to be generated. uint8_t ping_on_rst_stream_percent; + // The last time a transport window update was received. + grpc_core::Timestamp last_window_update_time = + grpc_core::Timestamp::InfPast(); + GPR_NO_UNIQUE_ADDRESS grpc_core::latent_see::Flow write_flow; }; @@ -677,6 +693,10 @@ struct grpc_chttp2_stream { /// Whether the bytes needs to be traced using Fathom bool traced = false; + + // The last time a stream window update was received. + grpc_core::Timestamp last_window_update_time = + grpc_core::Timestamp::InfPast(); }; #define GRPC_ARG_PING_TIMEOUT_MS "grpc.http2.ping_timeout_ms" @@ -687,6 +707,11 @@ struct grpc_chttp2_stream { #define GRPC_ARG_MAX_CONCURRENT_STREAMS_OVERLOAD_PROTECTION \ "grpc.http.overload_protection" +// EXPERIMENTAL: Fail requests at the client if the client is over max +// concurrent streams, so they may be retried elsewhere. +#define GRPC_ARG_MAX_CONCURRENT_STREAMS_REJECT_ON_CLIENT \ + "grpc.http.max_concurrent_streams_reject_on_client" + /// Transport writing call flow: /// grpc_chttp2_initiate_write() is called anywhere that we know bytes need to /// go out on the wire. diff --git a/src/core/ext/transport/chttp2/transport/legacy_frame.h b/src/core/ext/transport/chttp2/transport/legacy_frame.h index f0a6e639d7..14371f49aa 100644 --- a/src/core/ext/transport/chttp2/transport/legacy_frame.h +++ b/src/core/ext/transport/chttp2/transport/legacy_frame.h @@ -33,6 +33,7 @@ typedef struct grpc_chttp2_transport grpc_chttp2_transport; #define GRPC_CHTTP2_FRAME_PING 6 #define GRPC_CHTTP2_FRAME_GOAWAY 7 #define GRPC_CHTTP2_FRAME_WINDOW_UPDATE 8 +#define GRPC_CHTTP2_FRAME_SECURITY 200 #define GRPC_CHTTP2_DATA_FLAG_END_STREAM 1 #define GRPC_CHTTP2_FLAG_ACK 1 diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 7fa290db46..eb024e5b57 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -47,6 +47,7 @@ #include "src/core/ext/transport/chttp2/transport/frame_goaway.h" #include "src/core/ext/transport/chttp2/transport/frame_ping.h" #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h" +#include "src/core/ext/transport/chttp2/transport/frame_security.h" #include "src/core/ext/transport/chttp2/transport/frame_settings.h" #include "src/core/ext/transport/chttp2/transport/frame_window_update.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" @@ -68,6 +69,8 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/random_early_detection.h" #include "src/core/util/ref_counted_ptr.h" #include "src/core/util/status_helper.h" @@ -86,6 +89,7 @@ static grpc_error_handle init_window_update_frame_parser( grpc_chttp2_transport* t); static grpc_error_handle init_ping_parser(grpc_chttp2_transport* t); static grpc_error_handle init_goaway_parser(grpc_chttp2_transport* t); +static grpc_error_handle init_security_frame_parser(grpc_chttp2_transport* t); static grpc_error_handle init_non_header_skip_frame_parser( grpc_chttp2_transport* t); @@ -192,6 +196,8 @@ std::string FrameTypeString(uint8_t frame_type, uint8_t flags) { return MakeFrameTypeString("GOAWAY", flags, {}); case GRPC_CHTTP2_FRAME_WINDOW_UPDATE: return MakeFrameTypeString("WINDOW_UPDATE", flags, {}); + case GRPC_CHTTP2_FRAME_SECURITY: + return MakeFrameTypeString("SECURITY", flags, {}); default: return MakeFrameTypeString( absl::StrCat("UNKNOWN_FRAME_TYPE_", static_cast(frame_type)), @@ -449,6 +455,14 @@ static grpc_error_handle init_frame_parser(grpc_chttp2_transport* t, return init_ping_parser(t); case GRPC_CHTTP2_FRAME_GOAWAY: return init_goaway_parser(t); + case GRPC_CHTTP2_FRAME_SECURITY: + if (!t->settings.peer().allow_security_frame()) { + if (GRPC_TRACE_FLAG_ENABLED(http)) { + LOG(ERROR) << "Security frame received but not allowed, ignoring"; + } + return init_non_header_skip_frame_parser(t); + } + return init_security_frame_parser(t); default: GRPC_TRACE_LOG(http, ERROR) << "Unknown frame type " @@ -642,6 +656,18 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, GRPC_HTTP2_REFUSED_STREAM, nullptr)); grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); return init_header_skip_frame_parser(t, priority_type, is_eoh); + } else if (grpc_core::IsRqFastRejectEnabled() && + GPR_UNLIKELY(t->memory_owner.IsMemoryPressureHigh())) { + // We have more streams allocated than we'd like, so apply some pushback + // by refusing this stream. + grpc_core::global_stats().IncrementRqCallsRejected(); + ++t->num_pending_induced_frames; + grpc_slice_buffer_add( + &t->qbuf, + grpc_chttp2_rst_stream_create(t->incoming_stream_id, + GRPC_HTTP2_ENHANCE_YOUR_CALM, nullptr)); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM); + return init_header_skip_frame_parser(t, priority_type, is_eoh); } else if (GPR_UNLIKELY( t->max_concurrent_streams_overload_protection && t->streams_allocated.load(std::memory_order_relaxed) > @@ -868,6 +894,16 @@ static grpc_error_handle init_settings_frame_parser(grpc_chttp2_transport* t) { return absl::OkStatus(); } +static grpc_error_handle init_security_frame_parser(grpc_chttp2_transport* t) { + grpc_error_handle err = + grpc_chttp2_security_frame_parser_begin_frame(&t->security_frame_parser); + if (!err.ok()) return err; + t->parser = grpc_chttp2_transport::Parser{ + "security_frame", grpc_chttp2_security_frame_parser_parse, + &t->security_frame_parser}; + return absl::OkStatus(); +} + static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, const grpc_slice& slice, int is_last) { diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc index 2bf7daa04f..4ff249fa87 100644 --- a/src/core/ext/transport/chttp2/transport/stream_lists.cc +++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc @@ -25,6 +25,7 @@ #include "src/core/ext/transport/chttp2/transport/internal.h" #include "src/core/ext/transport/chttp2/transport/legacy_frame.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/experiments/experiments.h" #include "src/core/util/bitset.h" static const char* stream_list_id_string(grpc_chttp2_stream_list_id id) { @@ -127,6 +128,26 @@ static void stream_list_add_tail(grpc_chttp2_transport* t, << "]: add to " << stream_list_id_string(id); } +static void stream_list_add_head(grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + grpc_chttp2_stream_list_id id) { + grpc_chttp2_stream* old_head; + CHECK(!s->included.is_set(id)); + old_head = t->lists[id].head; + s->links[id].next = old_head; + s->links[id].prev = nullptr; + if (old_head) { + old_head->links[id].prev = s; + } else { + t->lists[id].tail = s; + } + t->lists[id].head = s; + s->included.set(id); + GRPC_TRACE_LOG(http2_stream_state, INFO) + << t << "[" << s->id << "][" << (t->is_client ? "cli" : "svr") + << "]: add to " << stream_list_id_string(id); +} + static bool stream_list_add(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_chttp2_stream_list_id id) { if (s->included.is_set(id)) { @@ -136,11 +157,24 @@ static bool stream_list_add(grpc_chttp2_transport* t, grpc_chttp2_stream* s, return true; } +static bool stream_list_prepend(grpc_chttp2_transport* t, grpc_chttp2_stream* s, + grpc_chttp2_stream_list_id id) { + if (s->included.is_set(id)) { + return false; + } + stream_list_add_head(t, s, id); + return true; +} + // wrappers for specializations bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { CHECK_NE(s->id, 0u); + if (grpc_core::IsPrioritizeFinishedRequestsEnabled() && + s->send_trailing_metadata != nullptr) { + return stream_list_prepend(t, s, GRPC_CHTTP2_LIST_WRITABLE); + } return stream_list_add(t, s, GRPC_CHTTP2_LIST_WRITABLE); } @@ -185,7 +219,12 @@ void grpc_chttp2_list_remove_waiting_for_concurrency(grpc_chttp2_transport* t, void grpc_chttp2_list_add_stalled_by_transport(grpc_chttp2_transport* t, grpc_chttp2_stream* s) { - stream_list_add(t, s, GRPC_CHTTP2_LIST_STALLED_BY_TRANSPORT); + if (grpc_core::IsPrioritizeFinishedRequestsEnabled() && + s->send_trailing_metadata != nullptr) { + stream_list_prepend(t, s, GRPC_CHTTP2_LIST_STALLED_BY_TRANSPORT); + } else { + stream_list_add(t, s, GRPC_CHTTP2_LIST_STALLED_BY_TRANSPORT); + } } bool grpc_chttp2_list_pop_stalled_by_transport(grpc_chttp2_transport* t, diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.h b/src/core/ext/transport/chttp2/transport/write_size_policy.h index 6f0098e69b..614ad9882f 100644 --- a/src/core/ext/transport/chttp2/transport/write_size_policy.h +++ b/src/core/ext/transport/chttp2/transport/write_size_policy.h @@ -39,7 +39,7 @@ class Chttp2WriteSizePolicy { return Duration::Milliseconds(300); } - // What size should be targetted for the next write. + // What size should be targeted for the next write. size_t WriteTargetSize(); // Notify the policy that a write of some size has begun. // EndWrite must be called when the write completes. 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 538c6aa2ee..ff036c2795 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 @@ -23,10 +23,10 @@ #include "absl/log/log.h" #include "absl/status/statusor.h" +#include "src/core/config/core_configuration.h" #include "src/core/ext/transport/cronet/transport/cronet_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index 16846ac196..ef0cd9bc1a 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -23,8 +23,8 @@ #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "src/core/config/core_configuration.h" #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/promise/promise.h" diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index fd7fc3f99b..0ae7aabe5e 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -42,9 +42,9 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "src/core/channelz/channelz.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" 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 f2e222df85..183950d352 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -766,4 +766,4 @@ UPB_INLINE void envoy_admin_v3_SubjectAlternateName_set_ip_address(envoy_admin_v #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_H_ */ 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 945e299b31..b60cce35bf 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_admin_v3_Certificates_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_admin_v3_Certificates__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__Certificate_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_admin_v3_Certificates__fields[1] = { }; const upb_MiniTable envoy__admin__v3__Certificates_msg_init = { - &envoy_admin_v3_Certificates_submsgs[0], + &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 @@ -39,7 +39,7 @@ const upb_MiniTable envoy__admin__v3__Certificates_msg_init = { }; const upb_MiniTable* envoy__admin__v3__Certificates_msg_init_ptr = &envoy__admin__v3__Certificates_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_Certificate_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_Certificate__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CertificateDetails_msg_init_ptr}, }; @@ -50,7 +50,7 @@ static const upb_MiniTableField envoy_admin_v3_Certificate__fields[2] = { }; const upb_MiniTable envoy__admin__v3__Certificate_msg_init = { - &envoy_admin_v3_Certificate_submsgs[0], + &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 @@ -65,7 +65,7 @@ const upb_MiniTable envoy__admin__v3__Certificate_msg_init = { }; const upb_MiniTable* envoy__admin__v3__Certificate_msg_init_ptr = &envoy__admin__v3__Certificate_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SubjectAlternateName_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, @@ -83,7 +83,7 @@ static const upb_MiniTableField envoy_admin_v3_CertificateDetails__fields[7] = { }; const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = { - &envoy_admin_v3_CertificateDetails_submsgs[0], + &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 @@ -102,7 +102,7 @@ const upb_MiniTable envoy__admin__v3__CertificateDetails_msg_init = { }; const upb_MiniTable* envoy__admin__v3__CertificateDetails_msg_init_ptr = &envoy__admin__v3__CertificateDetails_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_CertificateDetails_OcspDetails__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -113,7 +113,7 @@ static const upb_MiniTableField envoy_admin_v3_CertificateDetails_OcspDetails__f }; const upb_MiniTable envoy__admin__v3__CertificateDetails__OcspDetails_msg_init = { - &envoy_admin_v3_CertificateDetails_OcspDetails_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h index 7174dbbf9e..4cc36e037b 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_admin_v3_certs_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 675ad836ed..a8725113e9 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -880,4 +880,4 @@ UPB_INLINE void envoy_admin_v3_HostHealthStatus_set_active_hc_timeout(envoy_admi #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_H_ */ 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 7782060e99..70f4b4e74e 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 @@ -22,7 +22,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_admin_v3_Clusters_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_admin_v3_Clusters__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClusterStatus_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_admin_v3_Clusters__fields[1] = { }; const upb_MiniTable envoy__admin__v3__Clusters_msg_init = { - &envoy_admin_v3_Clusters_submsgs[0], + &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 @@ -44,7 +44,7 @@ const upb_MiniTable envoy__admin__v3__Clusters_msg_init = { }; const upb_MiniTable* envoy__admin__v3__Clusters_msg_init_ptr = &envoy__admin__v3__Clusters_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ClusterStatus_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ClusterStatus__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostStatus_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, @@ -63,7 +63,7 @@ static const upb_MiniTableField envoy_admin_v3_ClusterStatus__fields[8] = { }; const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = { - &envoy_admin_v3_ClusterStatus_submsgs[0], + &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 @@ -90,7 +90,7 @@ const upb_MiniTable envoy__admin__v3__ClusterStatus_msg_init = { }; const upb_MiniTable* envoy__admin__v3__ClusterStatus_msg_init_ptr = &envoy__admin__v3__ClusterStatus_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_HostStatus_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_admin_v3_HostStatus__submsgs[6] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SimpleMetric_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__HostHealthStatus_msg_init_ptr}, @@ -112,7 +112,7 @@ static const upb_MiniTableField envoy_admin_v3_HostStatus__fields[9] = { }; const upb_MiniTable envoy__admin__v3__HostStatus_msg_init = { - &envoy_admin_v3_HostStatus_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h index be0925efba..712835d2d7 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/clusters.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_admin_v3_clusters_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 becc1985ea..81f4529bbc 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -777,4 +777,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_StaticSe #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_H_ */ 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 3a446cc845..9f8b330951 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_admin_v3_ConfigDump_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ConfigDump__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_admin_v3_ConfigDump__fields[1] = { }; const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = { - &envoy_admin_v3_ConfigDump_submsgs[0], + &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 @@ -42,7 +42,7 @@ const upb_MiniTable envoy__admin__v3__ConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__ConfigDump_msg_init_ptr = &envoy__admin__v3__ConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_BootstrapConfigDump_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_BootstrapConfigDump__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -53,7 +53,7 @@ static const upb_MiniTableField envoy_admin_v3_BootstrapConfigDump__fields[2] = }; const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = { - &envoy_admin_v3_BootstrapConfigDump_submsgs[0], + &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 @@ -62,7 +62,7 @@ const upb_MiniTable envoy__admin__v3__BootstrapConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__BootstrapConfigDump_msg_init_ptr = &envoy__admin__v3__BootstrapConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr}, @@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump__fields[3] = { }; const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = { - &envoy_admin_v3_SecretsConfigDump_submsgs[0], + &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 @@ -90,7 +90,7 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__SecretsConfigDump_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_DynamicSecret__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, @@ -106,7 +106,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_DynamicSecret__ }; const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init = { - &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0], + &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 @@ -125,7 +125,7 @@ const upb_MiniTable envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init }; const upb_MiniTable* envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init_ptr = &envoy__admin__v3__SecretsConfigDump__DynamicSecret_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_SecretsConfigDump_StaticSecret__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -137,7 +137,7 @@ static const upb_MiniTableField envoy_admin_v3_SecretsConfigDump_StaticSecret__f }; const upb_MiniTable envoy__admin__v3__SecretsConfigDump__StaticSecret_msg_init = { - &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h index 4a92db9585..151259ffd9 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_admin_v3_config_dump_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 925854c0fd..c3f7e3c738 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -2957,4 +2957,4 @@ UPB_INLINE void envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_set_client_status #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_H_ */ 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 e53741de3d..01a408d1e4 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_admin_v3_UpdateFailureState_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_UpdateFailureState__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_admin_v3_UpdateFailureState__fields[4] = { }; const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = { - &envoy_admin_v3_UpdateFailureState_submsgs[0], + &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 @@ -50,7 +50,7 @@ const upb_MiniTable envoy__admin__v3__UpdateFailureState_msg_init = { }; const upb_MiniTable* envoy__admin__v3__UpdateFailureState_msg_init_ptr = &envoy__admin__v3__UpdateFailureState_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr}, }; @@ -62,7 +62,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump__fields[3] = }; const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = { - &envoy_admin_v3_ListenersConfigDump_submsgs[0], + &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 @@ -77,7 +77,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__ListenersConfigDump_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_StaticListener__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -88,7 +88,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_StaticListene }; const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init = { - &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0], + &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 @@ -97,7 +97,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__StaticListener_msg_in }; const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__StaticListener_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListenerState__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -109,7 +109,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListen }; const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init = { - &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0], + &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 @@ -122,7 +122,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListenerState_ }; const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ListenersConfigDump_DynamicListener__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump__DynamicListenerState_msg_init_ptr}, @@ -139,7 +139,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenersConfigDump_DynamicListen }; const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init = { - &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0], + &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 @@ -158,7 +158,7 @@ const upb_MiniTable envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_i }; const upb_MiniTable* envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init_ptr = &envoy__admin__v3__ListenersConfigDump__DynamicListener_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr}, @@ -172,7 +172,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump__fields[4] = { }; const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = { - &envoy_admin_v3_ClustersConfigDump_submsgs[0], + &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 @@ -191,7 +191,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__ClustersConfigDump_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_StaticCluster__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -202,7 +202,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_StaticCluster_ }; const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init = { - &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0], + &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 @@ -211,7 +211,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init }; const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump__StaticCluster_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ClustersConfigDump_DynamicCluster__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, @@ -226,7 +226,7 @@ static const upb_MiniTableField envoy_admin_v3_ClustersConfigDump_DynamicCluster }; const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init = { - &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0], + &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 @@ -245,7 +245,7 @@ const upb_MiniTable envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_ini }; const upb_MiniTable* envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init_ptr = &envoy__admin__v3__ClustersConfigDump__DynamicCluster_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr}, }; @@ -256,7 +256,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump__fields[2] = { }; const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = { - &envoy_admin_v3_RoutesConfigDump_submsgs[0], + &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 @@ -271,7 +271,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__RoutesConfigDump_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_StaticRouteConfi }; const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init = { - &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0], + &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 @@ -291,7 +291,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_in }; const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump__StaticRouteConfig_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, @@ -306,7 +306,7 @@ static const upb_MiniTableField envoy_admin_v3_RoutesConfigDump_DynamicRouteConf }; const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init = { - &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0], + &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 @@ -325,7 +325,7 @@ const upb_MiniTable envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_i }; const upb_MiniTable* envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init_ptr = &envoy__admin__v3__RoutesConfigDump__DynamicRouteConfig_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr}, }; @@ -336,7 +336,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump__fields[2] }; const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = { - &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0], + &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 @@ -351,7 +351,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -363,7 +363,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_InlineScop }; const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init = { - &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0], + &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 @@ -378,7 +378,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteC }; const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump__InlineScopedRouteConfigs_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, @@ -394,7 +394,7 @@ static const upb_MiniTableField envoy_admin_v3_ScopedRoutesConfigDump_DynamicSco }; const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init = { - &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0], + &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 @@ -413,7 +413,7 @@ const upb_MiniTable envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRoute }; const upb_MiniTable* envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init_ptr = &envoy__admin__v3__ScopedRoutesConfigDump__DynamicScopedRouteConfigs_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr}, }; @@ -424,7 +424,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump__fields[2] = }; const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = { - &envoy_admin_v3_EndpointsConfigDump_submsgs[0], + &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 @@ -439,7 +439,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -450,7 +450,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_StaticEndpoin }; const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init = { - &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0], + &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 @@ -459,7 +459,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_ }; const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump__StaticEndpointConfig_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, @@ -474,7 +474,7 @@ static const upb_MiniTableField envoy_admin_v3_EndpointsConfigDump_DynamicEndpoi }; const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init = { - &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0], + &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 @@ -493,7 +493,7 @@ const upb_MiniTable envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig }; const upb_MiniTable* envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init_ptr = &envoy__admin__v3__EndpointsConfigDump__DynamicEndpointConfig_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init_ptr}, }; @@ -502,7 +502,7 @@ static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump__fields[1] = { }; const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = { - &envoy_admin_v3_EcdsConfigDump_submsgs[0], + &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 @@ -515,7 +515,7 @@ const upb_MiniTable envoy__admin__v3__EcdsConfigDump_msg_init = { }; const upb_MiniTable* envoy__admin__v3__EcdsConfigDump_msg_init_ptr = &envoy__admin__v3__EcdsConfigDump_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, @@ -530,7 +530,7 @@ static const upb_MiniTableField envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__ }; const upb_MiniTable envoy__admin__v3__EcdsConfigDump__EcdsFilterConfig_msg_init = { - &envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h index fc75e9d4a1..511f4ab844 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/config_dump_shared.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -65,4 +65,4 @@ extern const upb_MiniTableFile envoy_admin_v3_config_dump_shared_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 6b8e432f54..699234353e 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -252,4 +252,4 @@ UPB_INLINE bool envoy_admin_v3_UnreadyTargetsDumps_UnreadyTargetsDump_add_target #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_H_ */ 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 296372af06..353406b501 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 @@ -15,7 +15,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_admin_v3_UnreadyTargetsDumps_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_admin_v3_UnreadyTargetsDumps__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UnreadyTargetsDumps__UnreadyTargetsDump_msg_init_ptr}, }; @@ -24,7 +24,7 @@ static const upb_MiniTableField envoy_admin_v3_UnreadyTargetsDumps__fields[1] = }; const upb_MiniTable envoy__admin__v3__UnreadyTargetsDumps_msg_init = { - &envoy_admin_v3_UnreadyTargetsDumps_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h index afd3edd461..06de230e9f 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/init_dump.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_admin_v3_init_dump_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 885a8d3d2a..ec33a4f356 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -292,4 +292,4 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_admin_v3_ListenerStatus_ad #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_H_ */ 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 1d62eedf11..e49f7d25cd 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_admin_v3_Listeners_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_admin_v3_Listeners__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenerStatus_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_admin_v3_Listeners__fields[1] = { }; const upb_MiniTable envoy__admin__v3__Listeners_msg_init = { - &envoy_admin_v3_Listeners_submsgs[0], + &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 @@ -39,7 +39,7 @@ const upb_MiniTable envoy__admin__v3__Listeners_msg_init = { }; const upb_MiniTable* envoy__admin__v3__Listeners_msg_init_ptr = &envoy__admin__v3__Listeners_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_ListenerStatus_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ListenerStatus__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, }; @@ -51,7 +51,7 @@ static const upb_MiniTableField envoy_admin_v3_ListenerStatus__fields[3] = { }; const upb_MiniTable envoy__admin__v3__ListenerStatus_msg_init = { - &envoy_admin_v3_ListenerStatus_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h index 998a4b864e..0d55265067 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/listeners.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_admin_v3_listeners_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 b7f76250e7..1114211e46 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -167,4 +167,4 @@ UPB_INLINE void envoy_admin_v3_Memory_set_total_physical_bytes(envoy_admin_v3_Me #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h index 9a6048ddb2..1c70ef5a5f 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/memory.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_admin_v3_memory_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 1fac77166b..3cbdd32ec4 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -124,4 +124,4 @@ UPB_INLINE void envoy_admin_v3_SimpleMetric_set_name(envoy_admin_v3_SimpleMetric #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h index 750f80aa6c..749d7b8012 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/metrics.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_admin_v3_metrics_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7f1ea08c32..4e4d05ed9f 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -119,4 +119,4 @@ UPB_INLINE void envoy_admin_v3_MutexStats_set_lifetime_wait_cycles(envoy_admin_v #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h index 44518b846d..d6e194e6eb 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/mutex_stats.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_admin_v3_mutex_stats_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 288d9b6dd8..df8c3066d1 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1011,4 +1011,4 @@ UPB_INLINE void envoy_admin_v3_CommandLineOptions_set_skip_hot_restart_parent_st #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_H_ */ 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 831d87e0f4..38181cf92d 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_admin_v3_ServerInfo_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_admin_v3_ServerInfo__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__CommandLineOptions_msg_init_ptr}, @@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_admin_v3_ServerInfo__fields[7] = { }; const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = { - &envoy_admin_v3_ServerInfo_submsgs[0], + &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 @@ -55,7 +55,7 @@ const upb_MiniTable envoy__admin__v3__ServerInfo_msg_init = { }; const upb_MiniTable* envoy__admin__v3__ServerInfo_msg_init_ptr = &envoy__admin__v3__ServerInfo_msg_init; -static const upb_MiniTableSubInternal envoy_admin_v3_CommandLineOptions_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_admin_v3_CommandLineOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -101,7 +101,7 @@ static const upb_MiniTableField envoy_admin_v3_CommandLineOptions__fields[36] = }; const upb_MiniTable envoy__admin__v3__CommandLineOptions_msg_init = { - &envoy_admin_v3_CommandLineOptions_submsgs[0], + &envoy_admin_v3_CommandLineOptions__submsgs[0], &envoy_admin_v3_CommandLineOptions__fields[0], UPB_SIZE(192, 304), 36, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED diff --git a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h index 66fa34fc53..bd2698123d 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/server_info.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_admin_v3_server_info_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 763012d156..09d186c4dc 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_ -#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_ +#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_ +#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -120,4 +120,4 @@ UPB_INLINE struct envoy_config_tap_v3_TapConfig* envoy_admin_v3_TapRequest_mutab #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H_ */ +#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_H_ */ 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 80e4e0894e..cbb0c1d1b6 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_admin_v3_TapRequest_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_admin_v3_TapRequest__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__TapConfig_msg_init_ptr}, }; @@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_admin_v3_TapRequest__fields[2] = { }; const upb_MiniTable envoy__admin__v3__TapRequest_msg_init = { - &envoy_admin_v3_TapRequest_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h index 0bd49aa2af..4fd0486202 100644 --- a/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/admin/v3/tap.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_admin_v3_tap_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 83f8f0a064..cc4f98db05 100644 --- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h +++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_ -#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_ +#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_ +#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -128,4 +128,4 @@ UPB_INLINE void envoy_annotations_set_deprecated_at_minor_version_enum(struct go #include "upb/port/undef.inc" -#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H_ */ +#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h index 47d7324f0e..06b1bb04ea 100644 --- a/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/annotations/deprecation.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_annotations_deprecation_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 8210346965..72033592ed 100644 --- a/src/core/ext/upb-gen/envoy/annotations/resource.upb.h +++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ -#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ +#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_ +#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -91,7 +91,7 @@ UPB_INLINE const envoy_annotations_ResourceAnnotation* envoy_annotations_resourc const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const envoy_annotations_ResourceAnnotation* default_val = NULL; const envoy_annotations_ResourceAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -101,7 +101,7 @@ UPB_INLINE void envoy_annotations_set_resource(struct google_protobuf_ServiceOpt const upb_MiniTableExtension* ext = &envoy_annotations_resource_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -120,4 +120,4 @@ UPB_INLINE struct envoy_annotations_ResourceAnnotation* envoy_annotations_mutabl #include "upb/port/undef.inc" -#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H_ */ +#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_H_ */ 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 56bbdca484..f0e785ea56 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 @@ -35,7 +35,7 @@ const upb_MiniTable envoy__annotations__ResourceAnnotation_msg_init = { const upb_MiniTable* envoy__annotations__ResourceAnnotation_msg_init_ptr = &envoy__annotations__ResourceAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension envoy_annotations_resource_ext = { - {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {265073217, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__ServiceOptions_msg_init, {.UPB_PRIVATE(submsg) = &envoy__annotations__ResourceAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h index b9a0330670..31b5c25be5 100644 --- a/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/annotations/resource.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -30,4 +30,4 @@ extern const upb_MiniTableFile envoy_annotations_resource_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 1c9e6d5e44..71453655ca 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ -#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1851,4 +1851,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_accesslog_v3_ExtensionFilter #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ */ 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 807f8ade0d..bae85f03d2 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 @@ -24,7 +24,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLog_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLog__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AccessLog__fields[3] = }; const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = { - &envoy_config_accesslog_v3_AccessLog_submsgs[0], + &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 @@ -55,7 +55,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLog_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__AccessLog_msg_init_ptr = &envoy__config__accesslog__v3__AccessLog_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLogFilter_submsgs[13] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AccessLogFilter__submsgs[13] = { {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__DurationFilter_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__NotHealthCheckFilter_msg_init_ptr}, @@ -88,7 +88,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AccessLogFilter__field }; const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = { - &envoy_config_accesslog_v3_AccessLogFilter_submsgs[0], + &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 @@ -115,7 +115,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AccessLogFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr = &envoy__config__accesslog__v3__AccessLogFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ComparisonFilter_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ComparisonFilter__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeUInt32_msg_init_ptr}, }; @@ -125,7 +125,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ComparisonFilter__fiel }; const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = { - &envoy_config_accesslog_v3_ComparisonFilter_submsgs[0], + &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 @@ -138,7 +138,7 @@ const upb_MiniTable envoy__config__accesslog__v3__ComparisonFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr = &envoy__config__accesslog__v3__ComparisonFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_StatusCodeFilter_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_StatusCodeFilter__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr}, }; @@ -147,7 +147,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_StatusCodeFilter__fiel }; const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = { - &envoy_config_accesslog_v3_StatusCodeFilter_submsgs[0], + &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 @@ -156,7 +156,7 @@ const upb_MiniTable envoy__config__accesslog__v3__StatusCodeFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__StatusCodeFilter_msg_init_ptr = &envoy__config__accesslog__v3__StatusCodeFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_DurationFilter_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_DurationFilter__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__ComparisonFilter_msg_init_ptr}, }; @@ -165,7 +165,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_DurationFilter__fields }; const upb_MiniTable envoy__config__accesslog__v3__DurationFilter_msg_init = { - &envoy_config_accesslog_v3_DurationFilter_submsgs[0], + &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 @@ -194,7 +194,7 @@ const upb_MiniTable envoy__config__accesslog__v3__TraceableFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__TraceableFilter_msg_init_ptr = &envoy__config__accesslog__v3__TraceableFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_RuntimeFilter_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_RuntimeFilter__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, }; @@ -205,7 +205,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_RuntimeFilter__fields[ }; const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = { - &envoy_config_accesslog_v3_RuntimeFilter_submsgs[0], + &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 @@ -220,7 +220,7 @@ const upb_MiniTable envoy__config__accesslog__v3__RuntimeFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__RuntimeFilter_msg_init_ptr = &envoy__config__accesslog__v3__RuntimeFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AndFilter_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_AndFilter__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr}, }; @@ -229,7 +229,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_AndFilter__fields[1] = }; const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = { - &envoy_config_accesslog_v3_AndFilter_submsgs[0], + &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 @@ -242,7 +242,7 @@ const upb_MiniTable envoy__config__accesslog__v3__AndFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__AndFilter_msg_init_ptr = &envoy__config__accesslog__v3__AndFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_OrFilter_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_OrFilter__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr}, }; @@ -251,7 +251,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_OrFilter__fields[1] = }; const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = { - &envoy_config_accesslog_v3_OrFilter_submsgs[0], + &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 @@ -266,7 +266,7 @@ const upb_MiniTable envoy__config__accesslog__v3__OrFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__OrFilter_msg_init_ptr = &envoy__config__accesslog__v3__OrFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_HeaderFilter_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_HeaderFilter__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; @@ -275,7 +275,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_HeaderFilter__fields[1 }; const upb_MiniTable envoy__config__accesslog__v3__HeaderFilter_msg_init = { - &envoy_config_accesslog_v3_HeaderFilter_submsgs[0], + &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 @@ -323,7 +323,7 @@ const upb_MiniTable envoy__config__accesslog__v3__GrpcStatusFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__GrpcStatusFilter_msg_init_ptr = &envoy__config__accesslog__v3__GrpcStatusFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_MetadataFilter_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_MetadataFilter__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -334,7 +334,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_MetadataFilter__fields }; const upb_MiniTable envoy__config__accesslog__v3__MetadataFilter_msg_init = { - &envoy_config_accesslog_v3_MetadataFilter_submsgs[0], + &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 @@ -364,7 +364,7 @@ const upb_MiniTable envoy__config__accesslog__v3__LogTypeFilter_msg_init = { }; const upb_MiniTable* envoy__config__accesslog__v3__LogTypeFilter_msg_init_ptr = &envoy__config__accesslog__v3__LogTypeFilter_msg_init; -static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ExtensionFilter_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_accesslog_v3_ExtensionFilter__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -374,7 +374,7 @@ static const upb_MiniTableField envoy_config_accesslog_v3_ExtensionFilter__field }; const upb_MiniTable envoy__config__accesslog__v3__ExtensionFilter_msg_init = { - &envoy_config_accesslog_v3_ExtensionFilter_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h index cce74f27d3..20cbe2a50c 100644 --- a/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/accesslog/v3/accesslog.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -59,4 +59,4 @@ extern const upb_MiniTableFile envoy_config_accesslog_v3_accesslog_proto_upb_fil #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 dc32c481dd..79485c78a0 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ -#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -3993,4 +3993,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_MemoryAllo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_H_ */ 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 563353a211..501cf7c473 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 @@ -38,7 +38,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_submsgs[31] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap__submsgs[31] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init_ptr}, @@ -115,7 +115,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap__fields[39] }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { - &envoy_config_bootstrap_v3_Bootstrap_submsgs[0], + &envoy_config_bootstrap_v3_Bootstrap__submsgs[0], &envoy_config_bootstrap_v3_Bootstrap__fields[0], UPB_SIZE(192, 344), 39, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -158,7 +158,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap_msg_init = { }; const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_StaticResources__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init_ptr}, @@ -171,7 +171,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_StaticResour }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init = { - &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0], + &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 @@ -186,7 +186,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg }; const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__StaticResources_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_DynamicResources__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr}, @@ -201,7 +201,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_DynamicResou }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init = { - &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0], + &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 @@ -220,7 +220,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DynamicResources_ms }; const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__DynamicResources_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init_ptr}, }; @@ -229,7 +229,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationL }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init = { - &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_submsgs[0], + &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 @@ -238,7 +238,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfi }; const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; @@ -248,7 +248,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_ApplicationL }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__ApplicationLogConfig__LogFormat_msg_init = { - &envoy_config_bootstrap_v3_Bootstrap_ApplicationLogConfig_LogFormat_submsgs[0], + &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 @@ -281,7 +281,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions }; const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__DeferredStatOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -290,7 +290,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncCli }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init = { - &envoy_config_bootstrap_v3_Bootstrap_GrpcAsyncClientManagerConfig_submsgs[0], + &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 @@ -299,7 +299,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientMana }; const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__GrpcAsyncClientManagerConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -309,7 +309,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Bootstrap_CertificateP }; const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init = { - &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0], + &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 @@ -322,7 +322,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Bootstrap__CertificateProvider }; const upb_MiniTable* envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init_ptr = &envoy__config__bootstrap__v3__Bootstrap__CertificateProviderInstancesEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Admin_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Admin__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init_ptr}, @@ -338,7 +338,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Admin__fields[6] = { }; const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = { - &envoy_config_bootstrap_v3_Admin_submsgs[0], + &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 @@ -357,7 +357,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Admin_msg_init = { }; const upb_MiniTable* envoy__config__bootstrap__v3__Admin_msg_init_ptr = &envoy__config__bootstrap__v3__Admin_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BindConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr}, @@ -372,7 +372,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager__fields }; const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = { - &envoy_config_bootstrap_v3_ClusterManager_submsgs[0], + &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 @@ -391,7 +391,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager_msg_init = { }; const upb_MiniTable* envoy__config__bootstrap__v3__ClusterManager_msg_init_ptr = &envoy__config__bootstrap__v3__ClusterManager_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EventServiceConfig_msg_init_ptr}, }; @@ -401,7 +401,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_ClusterManager_Outlier }; const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init = { - &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0], + &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 @@ -414,7 +414,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__ClusterManager__OutlierDetecti }; const upb_MiniTable* envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init_ptr = &envoy__config__bootstrap__v3__ClusterManager__OutlierDetection_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdogs_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdogs__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__Watchdog_msg_init_ptr}, }; @@ -425,7 +425,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdogs__fields[2] = }; const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = { - &envoy_config_bootstrap_v3_Watchdogs_submsgs[0], + &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 @@ -434,7 +434,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdogs_msg_init = { }; const upb_MiniTable* envoy__config__bootstrap__v3__Watchdogs_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdogs_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog_submsgs[7] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -455,7 +455,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog__fields[7] = }; const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = { - &envoy_config_bootstrap_v3_Watchdog_submsgs[0], + &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 @@ -474,7 +474,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog_msg_init = { }; const upb_MiniTable* envoy__config__bootstrap__v3__Watchdog_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdog_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Watchdog_WatchdogAction__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -484,7 +484,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Watchdog_WatchdogActio }; const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init = { - &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0], + &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 @@ -499,7 +499,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_i }; const upb_MiniTable* envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init_ptr = &envoy__config__bootstrap__v3__Watchdog__WatchdogAction_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_FatalAction_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_FatalAction__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -508,7 +508,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_FatalAction__fields[1] }; const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = { - &envoy_config_bootstrap_v3_FatalAction_submsgs[0], + &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 @@ -517,7 +517,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__FatalAction_msg_init = { }; const upb_MiniTable* envoy__config__bootstrap__v3__FatalAction_msg_init_ptr = &envoy__config__bootstrap__v3__FatalAction_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Runtime_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_Runtime__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; @@ -529,7 +529,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_Runtime__fields[4] = { }; const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = { - &envoy_config_bootstrap_v3_Runtime_submsgs[0], + &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 @@ -544,7 +544,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__Runtime_msg_init = { }; const upb_MiniTable* envoy__config__bootstrap__v3__Runtime_msg_init_ptr = &envoy__config__bootstrap__v3__Runtime_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__DiskLayer_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init_ptr}, @@ -560,7 +560,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer__fields[5 }; const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer_msg_init = { - &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0], + &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 @@ -611,7 +611,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_i }; const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init_ptr = &envoy__config__bootstrap__v3__RuntimeLayer__AdminLayer_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; @@ -621,7 +621,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer }; const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init = { - &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0], + &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 @@ -634,7 +634,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_in }; const upb_MiniTable* envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init_ptr = &envoy__config__bootstrap__v3__RuntimeLayer__RtdsLayer_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_LayeredRuntime__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__bootstrap__v3__RuntimeLayer_msg_init_ptr}, }; @@ -643,7 +643,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_LayeredRuntime__fields }; const upb_MiniTable envoy__config__bootstrap__v3__LayeredRuntime_msg_init = { - &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0], + &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 @@ -677,7 +677,7 @@ const upb_MiniTable envoy__config__bootstrap__v3__CustomInlineHeader_msg_init = }; const upb_MiniTable* envoy__config__bootstrap__v3__CustomInlineHeader_msg_init_ptr = &envoy__config__bootstrap__v3__CustomInlineHeader_msg_init; -static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_bootstrap_v3_MemoryAllocatorManager__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -687,7 +687,7 @@ static const upb_MiniTableField envoy_config_bootstrap_v3_MemoryAllocatorManager }; const upb_MiniTable envoy__config__bootstrap__v3__MemoryAllocatorManager_msg_init = { - &envoy_config_bootstrap_v3_MemoryAllocatorManager_submsgs[0], + &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 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 fc0333a312..f55a0226b3 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -73,4 +73,4 @@ extern const upb_MiniTableFile envoy_config_bootstrap_v3_bootstrap_proto_upb_fil #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 f2a3437673..e7c8d03a26 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_ -#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -561,4 +561,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_CircuitBr #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_H_ */ 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 5fa07fe8be..699674e161 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers__fields[ }; const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = { - &envoy_config_cluster_v3_CircuitBreakers_submsgs[0], + &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 @@ -46,7 +46,7 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers_msg_init = { }; const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers_msg_init_ptr = &envoy__config__cluster__v3__CircuitBreakers_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds__submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -67,7 +67,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Threshol }; const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init = { - &envoy_config_cluster_v3_CircuitBreakers_Thresholds_submsgs[0], + &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 @@ -86,7 +86,7 @@ const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_ }; const upb_MiniTable* envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init_ptr = &envoy__config__cluster__v3__CircuitBreakers__Thresholds_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -97,7 +97,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_CircuitBreakers_Threshol }; const upb_MiniTable envoy__config__cluster__v3__CircuitBreakers__Thresholds__RetryBudget_msg_init = { - &envoy_config_cluster_v3_CircuitBreakers_Thresholds_RetryBudget_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h index 7b95c84f89..8e9d6b14c6 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/circuit_breaker.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_config_cluster_v3_circuit_breaker_proto_upb #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 df151184d3..c064459b16 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ -#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -4417,4 +4417,4 @@ UPB_INLINE void envoy_config_cluster_v3_TrackClusterStats_set_per_endpoint_stats #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_H_ */ 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 f6b9ba6d2e..970c2279f6 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 @@ -38,7 +38,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_cluster_v3_ClusterCollection_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_ClusterCollection__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init_ptr}, }; @@ -47,7 +47,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_ClusterCollection__field }; const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = { - &envoy_config_cluster_v3_ClusterCollection_submsgs[0], + &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 @@ -56,7 +56,7 @@ const upb_MiniTable envoy__config__cluster__v3__ClusterCollection_msg_init = { }; const upb_MiniTable* envoy__config__cluster__v3__ClusterCollection_msg_init_ptr = &envoy__config__cluster__v3__ClusterCollection_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_submsgs[39] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster__submsgs[39] = { {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -154,7 +154,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster__fields[52] = { }; const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = { - &envoy_config_cluster_v3_Cluster_submsgs[0], + &envoy_config_cluster_v3_Cluster__submsgs[0], &envoy_config_cluster_v3_Cluster__fields[0], UPB_SIZE(216, 360), 52, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -197,7 +197,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster_msg_init = { }; const upb_MiniTable* envoy__config__cluster__v3__Cluster_msg_init_ptr = &envoy__config__cluster__v3__Cluster_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TransportSocketMatch__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init_ptr}, }; @@ -209,7 +209,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TransportSocketM }; const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init = { - &envoy_config_cluster_v3_Cluster_TransportSocketMatch_submsgs[0], + &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 @@ -222,7 +222,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TransportSocketMatch_ms }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init_ptr = &envoy__config__cluster__v3__Cluster__TransportSocketMatch_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CustomClusterType__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -232,7 +232,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CustomClusterTyp }; const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init = { - &envoy_config_cluster_v3_Cluster_CustomClusterType_submsgs[0], + &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 @@ -245,7 +245,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CustomClusterType_msg_i }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CustomClusterType_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_EdsClusterConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; @@ -255,7 +255,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_EdsClusterConfig }; const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init = { - &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0], + &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 @@ -270,7 +270,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_in }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__EdsClusterConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LbSubsetConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init_ptr}, }; @@ -287,7 +287,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LbSubsetConfig__ }; 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__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 @@ -341,7 +341,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubse }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init_ptr = &envoy__config__cluster__v3__Cluster__LbSubsetConfig__LbSubsetSelector_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_SlowStartConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, @@ -354,7 +354,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_SlowStartConfig_ }; const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init = { - &envoy_config_cluster_v3_Cluster_SlowStartConfig_submsgs[0], + &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 @@ -363,7 +363,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_ini }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RoundRobinLbConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr}, }; @@ -372,7 +372,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RoundRobinLbConf }; const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init = { - &envoy_config_cluster_v3_Cluster_RoundRobinLbConfig_submsgs[0], + &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 @@ -381,7 +381,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_ }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RoundRobinLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_LeastRequestLbConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__SlowStartConfig_msg_init_ptr}, @@ -394,7 +394,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_LeastRequestLbCo }; const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init = { - &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_submsgs[0], + &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 @@ -403,7 +403,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_ms }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__LeastRequestLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RingHashLbConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; @@ -415,7 +415,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RingHashLbConfig }; const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init = { - &envoy_config_cluster_v3_Cluster_RingHashLbConfig_submsgs[0], + &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 @@ -430,7 +430,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_in }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RingHashLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_MaglevLbConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_MaglevLbConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; @@ -439,7 +439,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_MaglevLbConfig__ }; 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__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 @@ -448,7 +448,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__MaglevLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_OriginalDstLbConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; @@ -461,7 +461,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_OriginalDstLbCon }; const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init = { - &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_submsgs[0], + &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 @@ -476,7 +476,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__OriginalDstLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig__submsgs[6] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init_ptr}, @@ -497,7 +497,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig__ }; 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__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 @@ -516,7 +516,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; @@ -528,7 +528,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_Z }; const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ZoneAwareLbConfig_msg_init = { - &envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig_submsgs[0], + &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 @@ -553,7 +553,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Localit }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig__LocalityWeightedLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -563,7 +563,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_CommonLbConfig_C }; const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init = { - &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_submsgs[0], + &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 @@ -576,7 +576,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__CommonLbConfig__Consist }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init_ptr = &envoy__config__cluster__v3__Cluster__CommonLbConfig__ConsistentHashingLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RefreshRate_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_RefreshRate__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -587,7 +587,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_RefreshRate__fie }; 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__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 @@ -596,7 +596,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__RefreshRate_msg_init = }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__RefreshRate_msg_init_ptr = &envoy__config__cluster__v3__Cluster__RefreshRate_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_PreconnectPolicy__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr}, }; @@ -607,7 +607,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_PreconnectPolicy }; const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init = { - &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0], + &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 @@ -616,7 +616,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_in }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init_ptr = &envoy__config__cluster__v3__Cluster__PreconnectPolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -626,7 +626,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Cluster_TypedExtensionPr }; const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init = { - &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_submsgs[0], + &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 @@ -639,7 +639,7 @@ const upb_MiniTable envoy__config__cluster__v3__Cluster__TypedExtensionProtocolO }; const upb_MiniTable* envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init_ptr = &envoy__config__cluster__v3__Cluster__TypedExtensionProtocolOptionsEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init_ptr}, }; @@ -648,7 +648,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy__fie }; const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = { - &envoy_config_cluster_v3_LoadBalancingPolicy_submsgs[0], + &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 @@ -661,7 +661,7 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy_msg_init = { }; const upb_MiniTable* envoy__config__cluster__v3__LoadBalancingPolicy_msg_init_ptr = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_LoadBalancingPolicy_Policy__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -670,7 +670,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_LoadBalancingPolicy_Poli }; const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init = { - &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_submsgs[0], + &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 @@ -679,7 +679,7 @@ const upb_MiniTable envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_ }; const upb_MiniTable* envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init_ptr = &envoy__config__cluster__v3__LoadBalancingPolicy__Policy_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TcpKeepalive_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__UpstreamConnectionOptions__HappyEyeballsConfig_msg_init_ptr}, }; @@ -691,7 +691,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOption }; const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init = { - &envoy_config_cluster_v3_UpstreamConnectionOptions_submsgs[0], + &envoy_config_cluster_v3_UpstreamConnectionOptions__submsgs[0], &envoy_config_cluster_v3_UpstreamConnectionOptions__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -706,7 +706,7 @@ const upb_MiniTable envoy__config__cluster__v3__UpstreamConnectionOptions_msg_in }; const upb_MiniTable* envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init_ptr = &envoy__config__cluster__v3__UpstreamConnectionOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_UpstreamConnectionOptions_HappyEyeballsConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -716,7 +716,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_UpstreamConnectionOption }; 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__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 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 f25cea5126..3544019a86 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -77,4 +77,4 @@ extern const upb_MiniTableFile envoy_config_cluster_v3_cluster_proto_upb_file_la #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 3f9f2e61be..89956626ee 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_ -#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -152,4 +152,4 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_clust #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_H_ */ 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 461ee53b89..fc4d1f645b 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_cluster_v3_Filter_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_Filter__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_Filter__fields[3] = { }; const upb_MiniTable envoy__config__cluster__v3__Filter_msg_init = { - &envoy_config_cluster_v3_Filter_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h index b55f7b8707..1ccb0027bb 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/filter.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_cluster_v3_filter_proto_upb_file_lay #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 45626ff00a..55b22037fb 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_ -#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -852,4 +852,4 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_cluster_v3_OutlierDete #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_H_ */ 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 93855c1c6b..21aba9e266 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_cluster_v3_OutlierDetection_submsgs[24] = { +static const upb_MiniTableSubInternal envoy_config_cluster_v3_OutlierDetection__submsgs[24] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -76,7 +76,7 @@ static const upb_MiniTableField envoy_config_cluster_v3_OutlierDetection__fields }; const upb_MiniTable envoy__config__cluster__v3__OutlierDetection_msg_init = { - &envoy_config_cluster_v3_OutlierDetection_submsgs[0], + &envoy_config_cluster_v3_OutlierDetection__submsgs[0], &envoy_config_cluster_v3_OutlierDetection__fields[0], UPB_SIZE(112, 208), 25, kUpb_ExtMode_NonExtendable, 25, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED diff --git a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h index 722d1a2415..74820ba44c 100644 --- a/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/cluster/v3/outlier_detection.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_cluster_v3_outlier_detection_proto_u #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 11416680b0..29becd66ea 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_ -#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1974,4 +1974,4 @@ UPB_INLINE void envoy_config_common_matcher_v3_HttpGenericBodyMatch_GenericTextM #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ */ 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 37517131a0..047c2f6a71 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr}, @@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher__fields[3 }; 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__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 @@ -47,7 +47,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher_msg_init = { }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_OnMatch__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -58,7 +58,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_OnMatch__ }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init = { - &envoy_config_common_matcher_v3_Matcher_OnMatch_submsgs[0], + &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 @@ -73,7 +73,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__OnMatch_msg_ini }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr}, }; @@ -82,7 +82,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init = { - &envoy_config_common_matcher_v3_Matcher_MatcherList_submsgs[0], + &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 @@ -95,7 +95,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList_msg }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr}, @@ -110,7 +110,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init = { - &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0], + &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 @@ -129,7 +129,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, @@ -142,7 +142,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init = { - &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0], + &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 @@ -157,7 +157,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, }; @@ -166,7 +166,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init = { - &envoy_config_common_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0], + &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 @@ -179,7 +179,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Pr }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -190,7 +190,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherLi }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init = { - &envoy_config_common_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0], + &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 @@ -199,7 +199,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherList__Fi }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr}, @@ -214,7 +214,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTr }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init = { - &envoy_config_common_matcher_v3_Matcher_MatcherTree_submsgs[0], + &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 @@ -233,7 +233,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree_msg }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr}, }; @@ -242,7 +242,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTr }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init = { - &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0], + &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 @@ -251,7 +251,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -261,7 +261,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_Matcher_MatcherTr }; const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init = { - &envoy_config_common_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0], + &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 @@ -274,7 +274,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__Matcher__MatcherTree__Ma }; const upb_MiniTable* envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr = &envoy__config__common__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate_submsgs[9] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate__submsgs[9] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr}, @@ -300,7 +300,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate__f }; 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__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 @@ -327,7 +327,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate_msg_init }; const upb_MiniTable* envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr = &envoy__config__common__matcher__v3__MatchPredicate_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_MatchPredicate_MatchSet__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__MatchPredicate_msg_init_ptr}, }; @@ -336,7 +336,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_MatchPredicate_Ma }; const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init = { - &envoy_config_common_matcher_v3_MatchPredicate_MatchSet_submsgs[0], + &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 @@ -349,7 +349,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__MatchPredicate__MatchSet }; const upb_MiniTable* envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init_ptr = &envoy__config__common__matcher__v3__MatchPredicate__MatchSet_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpHeadersMatch__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; @@ -358,7 +358,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_HttpHeadersMatch_ }; const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init = { - &envoy_config_common_matcher_v3_HttpHeadersMatch_submsgs[0], + &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 @@ -371,7 +371,7 @@ const upb_MiniTable envoy__config__common__matcher__v3__HttpHeadersMatch_msg_ini }; const upb_MiniTable* envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init_ptr = &envoy__config__common__matcher__v3__HttpHeadersMatch_msg_init; -static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_common_matcher_v3_HttpGenericBodyMatch__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__common__matcher__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr}, }; @@ -381,7 +381,7 @@ static const upb_MiniTableField envoy_config_common_matcher_v3_HttpGenericBodyMa }; const upb_MiniTable envoy__config__common__matcher__v3__HttpGenericBodyMatch_msg_init = { - &envoy_config_common_matcher_v3_HttpGenericBodyMatch_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h index 00db11a07e..8312f75af5 100644 --- a/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/common/matcher/v3/matcher.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -57,4 +57,4 @@ extern const upb_MiniTableFile envoy_config_common_matcher_v3_matcher_proto_upb_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c22a2f0b81..9310611605 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1138,4 +1138,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_core_v3_CidrRange_mu #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_H_ */ 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 132a33c671..4e317fb4d6 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 @@ -92,7 +92,7 @@ const upb_MiniTable envoy__config__core__v3__SocketAddress_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__SocketAddress_msg_init_ptr = &envoy__config__core__v3__SocketAddress_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_TcpKeepalive_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_TcpKeepalive__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -105,7 +105,7 @@ static const upb_MiniTableField envoy_config_core_v3_TcpKeepalive__fields[3] = { }; const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = { - &envoy_config_core_v3_TcpKeepalive_submsgs[0], + &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 @@ -114,7 +114,7 @@ const upb_MiniTable envoy__config__core__v3__TcpKeepalive_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__TcpKeepalive_msg_init_ptr = &envoy__config__core__v3__TcpKeepalive_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_ExtraSourceAddress_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_ExtraSourceAddress__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr}, }; @@ -125,7 +125,7 @@ static const upb_MiniTableField envoy_config_core_v3_ExtraSourceAddress__fields[ }; const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = { - &envoy_config_core_v3_ExtraSourceAddress_submsgs[0], + &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 @@ -134,7 +134,7 @@ const upb_MiniTable envoy__config__core__v3__ExtraSourceAddress_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__ExtraSourceAddress_msg_init_ptr = &envoy__config__core__v3__ExtraSourceAddress_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_BindConfig_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_BindConfig__submsgs[6] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr}, @@ -153,7 +153,7 @@ static const upb_MiniTableField envoy_config_core_v3_BindConfig__fields[6] = { }; const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = { - &envoy_config_core_v3_BindConfig_submsgs[0], + &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 @@ -172,7 +172,7 @@ const upb_MiniTable envoy__config__core__v3__BindConfig_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__BindConfig_msg_init_ptr = &envoy__config__core__v3__BindConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Address_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Address__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Pipe_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__EnvoyInternalAddress_msg_init_ptr}, @@ -185,7 +185,7 @@ static const upb_MiniTableField envoy_config_core_v3_Address__fields[3] = { }; const upb_MiniTable envoy__config__core__v3__Address_msg_init = { - &envoy_config_core_v3_Address_submsgs[0], + &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 @@ -200,7 +200,7 @@ const upb_MiniTable envoy__config__core__v3__Address_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__Address_msg_init_ptr = &envoy__config__core__v3__Address_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_CidrRange_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_CidrRange__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -210,7 +210,7 @@ static const upb_MiniTableField envoy_config_core_v3_CidrRange__fields[2] = { }; const upb_MiniTable envoy__config__core__v3__CidrRange_msg_init = { - &envoy_config_core_v3_CidrRange_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h index 268dbaf0d4..589c293ff2 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/address.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -43,4 +43,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_address_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 067eff56a4..2244301e42 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -134,4 +134,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_BackoffStrategy #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_H_ */ 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 7541013110..3e1d3fd22f 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_BackoffStrategy_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_BackoffStrategy__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_config_core_v3_BackoffStrategy__fields[2] }; const upb_MiniTable envoy__config__core__v3__BackoffStrategy_msg_init = { - &envoy_config_core_v3_BackoffStrategy_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h index ab12e8dcc7..144ffb4908 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/backoff.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_backoff_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c5ef155ddb..2735f81007 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -3214,4 +3214,4 @@ UPB_INLINE void envoy_config_core_v3_ControlPlane_set_identifier(envoy_config_co #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_H_ */ 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 cfd0274e7d..68a640b480 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 @@ -50,7 +50,7 @@ const upb_MiniTable envoy__config__core__v3__Locality_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__Locality_msg_init_ptr = &envoy__config__core__v3__Locality_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_BuildVersion_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_BuildVersion__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__SemanticVersion_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; @@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_core_v3_BuildVersion__fields[2] = { }; const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = { - &envoy_config_core_v3_BuildVersion_submsgs[0], + &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 @@ -70,7 +70,7 @@ const upb_MiniTable envoy__config__core__v3__BuildVersion_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__BuildVersion_msg_init_ptr = &envoy__config__core__v3__BuildVersion_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Extension_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Extension__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BuildVersion_msg_init_ptr}, }; @@ -84,7 +84,7 @@ static const upb_MiniTableField envoy_config_core_v3_Extension__fields[6] = { }; const upb_MiniTable envoy__config__core__v3__Extension_msg_init = { - &envoy_config_core_v3_Extension_submsgs[0], + &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 @@ -103,7 +103,7 @@ const upb_MiniTable envoy__config__core__v3__Extension_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__Extension_msg_init_ptr = &envoy__config__core__v3__Extension_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Node_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Node__submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BuildVersion_msg_init_ptr}, @@ -127,7 +127,7 @@ static const upb_MiniTableField envoy_config_core_v3_Node__fields[11] = { }; const upb_MiniTable envoy__config__core__v3__Node_msg_init = { - &envoy_config_core_v3_Node_submsgs[0], + &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 @@ -154,7 +154,7 @@ const upb_MiniTable envoy__config__core__v3__Node_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__Node_msg_init_ptr = &envoy__config__core__v3__Node_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Node_DynamicParametersEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr}, }; @@ -164,7 +164,7 @@ static const upb_MiniTableField envoy_config_core_v3_Node_DynamicParametersEntry }; const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_init = { - &envoy_config_core_v3_Node_DynamicParametersEntry_submsgs[0], + &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 @@ -177,7 +177,7 @@ const upb_MiniTable envoy__config__core__v3__Node__DynamicParametersEntry_msg_in }; const upb_MiniTable* envoy__config__core__v3__Node__DynamicParametersEntry_msg_init_ptr = &envoy__config__core__v3__Node__DynamicParametersEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init_ptr}, }; @@ -188,7 +188,7 @@ static const upb_MiniTableField envoy_config_core_v3_Metadata__fields[2] = { }; const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = { - &envoy_config_core_v3_Metadata_submsgs[0], + &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 @@ -197,7 +197,7 @@ const upb_MiniTable envoy__config__core__v3__Metadata_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__Metadata_msg_init_ptr = &envoy__config__core__v3__Metadata_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_FilterMetadataEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; @@ -207,7 +207,7 @@ static const upb_MiniTableField envoy_config_core_v3_Metadata_FilterMetadataEntr }; const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init = { - &envoy_config_core_v3_Metadata_FilterMetadataEntry_submsgs[0], + &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 @@ -220,7 +220,7 @@ const upb_MiniTable envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_i }; const upb_MiniTable* envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init_ptr = &envoy__config__core__v3__Metadata__FilterMetadataEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Metadata_TypedFilterMetadataEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -230,7 +230,7 @@ static const upb_MiniTableField envoy_config_core_v3_Metadata_TypedFilterMetadat }; const upb_MiniTable envoy__config__core__v3__Metadata__TypedFilterMetadataEntry_msg_init = { - &envoy_config_core_v3_Metadata_TypedFilterMetadataEntry_submsgs[0], + &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 @@ -264,7 +264,7 @@ const upb_MiniTable envoy__config__core__v3__RuntimeUInt32_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__RuntimeUInt32_msg_init_ptr = &envoy__config__core__v3__RuntimeUInt32_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimePercent_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimePercent__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, }; @@ -274,7 +274,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimePercent__fields[2] = }; const upb_MiniTable envoy__config__core__v3__RuntimePercent_msg_init = { - &envoy_config_core_v3_RuntimePercent_submsgs[0], + &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 @@ -310,7 +310,7 @@ const upb_MiniTable envoy__config__core__v3__RuntimeDouble_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__RuntimeDouble_msg_init_ptr = &envoy__config__core__v3__RuntimeDouble_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFeatureFlag_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFeatureFlag__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -320,7 +320,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimeFeatureFlag__fields[ }; const upb_MiniTable envoy__config__core__v3__RuntimeFeatureFlag_msg_init = { - &envoy_config_core_v3_RuntimeFeatureFlag_submsgs[0], + &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 @@ -356,7 +356,7 @@ const upb_MiniTable envoy__config__core__v3__KeyValue_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__KeyValue_msg_init_ptr = &envoy__config__core__v3__KeyValue_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueAppend_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueAppend__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValue_msg_init_ptr}, }; @@ -366,7 +366,7 @@ static const upb_MiniTableField envoy_config_core_v3_KeyValueAppend__fields[2] = }; const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init = { - &envoy_config_core_v3_KeyValueAppend_submsgs[0], + &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 @@ -381,7 +381,7 @@ const upb_MiniTable envoy__config__core__v3__KeyValueAppend_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__KeyValueAppend_msg_init_ptr = &envoy__config__core__v3__KeyValueAppend_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueMutation_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_KeyValueMutation__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__KeyValueAppend_msg_init_ptr}, }; @@ -391,7 +391,7 @@ static const upb_MiniTableField envoy_config_core_v3_KeyValueMutation__fields[2] }; const upb_MiniTable envoy__config__core__v3__KeyValueMutation_msg_init = { - &envoy_config_core_v3_KeyValueMutation_submsgs[0], + &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 @@ -449,7 +449,7 @@ const upb_MiniTable envoy__config__core__v3__HeaderValue_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__HeaderValue_msg_init_ptr = &envoy__config__core__v3__HeaderValue_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderValueOption_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderValueOption__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -462,7 +462,7 @@ static const upb_MiniTableField envoy_config_core_v3_HeaderValueOption__fields[4 }; const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = { - &envoy_config_core_v3_HeaderValueOption_submsgs[0], + &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 @@ -481,7 +481,7 @@ const upb_MiniTable envoy__config__core__v3__HeaderValueOption_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__HeaderValueOption_msg_init_ptr = &envoy__config__core__v3__HeaderValueOption_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderMap_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HeaderMap__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValue_msg_init_ptr}, }; @@ -490,7 +490,7 @@ static const upb_MiniTableField envoy_config_core_v3_HeaderMap__fields[1] = { }; const upb_MiniTable envoy__config__core__v3__HeaderMap_msg_init = { - &envoy_config_core_v3_HeaderMap_submsgs[0], + &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 @@ -521,7 +521,7 @@ const upb_MiniTable envoy__config__core__v3__WatchedDirectory_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__WatchedDirectory_msg_init_ptr = &envoy__config__core__v3__WatchedDirectory_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_DataSource_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_DataSource__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init_ptr}, }; @@ -534,7 +534,7 @@ static const upb_MiniTableField envoy_config_core_v3_DataSource__fields[5] = { }; const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = { - &envoy_config_core_v3_DataSource_submsgs[0], + &envoy_config_core_v3_DataSource__submsgs[0], &envoy_config_core_v3_DataSource__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -553,7 +553,7 @@ const upb_MiniTable envoy__config__core__v3__DataSource_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__DataSource_msg_init_ptr = &envoy__config__core__v3__DataSource_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__BackoffStrategy_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init_ptr}, @@ -570,7 +570,7 @@ static const upb_MiniTableField envoy_config_core_v3_RetryPolicy__fields[6] = { }; const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = { - &envoy_config_core_v3_RetryPolicy_submsgs[0], + &envoy_config_core_v3_RetryPolicy__submsgs[0], &envoy_config_core_v3_RetryPolicy__fields[0], UPB_SIZE(48, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -589,7 +589,7 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__RetryPolicy_msg_init_ptr = &envoy__config__core__v3__RetryPolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryPriority_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryPriority__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -599,7 +599,7 @@ static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryPriority__ }; 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__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 @@ -614,7 +614,7 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init }; const upb_MiniTable* envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init_ptr = &envoy__config__core__v3__RetryPolicy__RetryPriority_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_RetryPolicy_RetryHostPredicate__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -624,7 +624,7 @@ static const upb_MiniTableField envoy_config_core_v3_RetryPolicy_RetryHostPredic }; 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__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 @@ -639,7 +639,7 @@ const upb_MiniTable envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg }; const upb_MiniTable* envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr = &envoy__config__core__v3__RetryPolicy__RetryHostPredicate_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_RemoteDataSource_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_RemoteDataSource__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr}, }; @@ -651,7 +651,7 @@ static const upb_MiniTableField envoy_config_core_v3_RemoteDataSource__fields[3] }; const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = { - &envoy_config_core_v3_RemoteDataSource_submsgs[0], + &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 @@ -666,7 +666,7 @@ const upb_MiniTable envoy__config__core__v3__RemoteDataSource_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__RemoteDataSource_msg_init_ptr = &envoy__config__core__v3__RemoteDataSource_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_AsyncDataSource_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_AsyncDataSource__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RemoteDataSource_msg_init_ptr}, }; @@ -677,7 +677,7 @@ static const upb_MiniTableField envoy_config_core_v3_AsyncDataSource__fields[2] }; const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = { - &envoy_config_core_v3_AsyncDataSource_submsgs[0], + &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 @@ -692,7 +692,7 @@ const upb_MiniTable envoy__config__core__v3__AsyncDataSource_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__AsyncDataSource_msg_init_ptr = &envoy__config__core__v3__AsyncDataSource_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_TransportSocket_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_TransportSocket__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -702,7 +702,7 @@ static const upb_MiniTableField envoy_config_core_v3_TransportSocket__fields[2] }; const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = { - &envoy_config_core_v3_TransportSocket_submsgs[0], + &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 @@ -717,7 +717,7 @@ const upb_MiniTable envoy__config__core__v3__TransportSocket_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__TransportSocket_msg_init_ptr = &envoy__config__core__v3__TransportSocket_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFractionalPercent_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_RuntimeFractionalPercent__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, }; @@ -727,7 +727,7 @@ static const upb_MiniTableField envoy_config_core_v3_RuntimeFractionalPercent__f }; const upb_MiniTable envoy__config__core__v3__RuntimeFractionalPercent_msg_init = { - &envoy_config_core_v3_RuntimeFractionalPercent_submsgs[0], + &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 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 351591b593..4fa102038f 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -85,4 +85,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_base_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 3aff493e6d..a2b8949031 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1193,4 +1193,4 @@ UPB_INLINE bool envoy_config_core_v3_ExtensionConfigSource_add_type_urls(envoy_c #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_H_ */ 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 5b1c268dfe..54cf52dae7 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 @@ -25,7 +25,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_ApiConfigSource_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_ApiConfigSource__submsgs[5] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -46,7 +46,7 @@ static const upb_MiniTableField envoy_config_core_v3_ApiConfigSource__fields[9] }; const upb_MiniTable envoy__config__core__v3__ApiConfigSource_msg_init = { - &envoy_config_core_v3_ApiConfigSource_submsgs[0], + &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 @@ -101,7 +101,7 @@ const upb_MiniTable envoy__config__core__v3__SelfConfigSource_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__SelfConfigSource_msg_init_ptr = &envoy__config__core__v3__SelfConfigSource_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_RateLimitSettings_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_RateLimitSettings__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__DoubleValue_msg_init_ptr}, }; @@ -112,7 +112,7 @@ static const upb_MiniTableField envoy_config_core_v3_RateLimitSettings__fields[2 }; const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = { - &envoy_config_core_v3_RateLimitSettings_submsgs[0], + &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 @@ -121,7 +121,7 @@ const upb_MiniTable envoy__config__core__v3__RateLimitSettings_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__RateLimitSettings_msg_init_ptr = &envoy__config__core__v3__RateLimitSettings_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_PathConfigSource_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_PathConfigSource__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__WatchedDirectory_msg_init_ptr}, }; @@ -131,7 +131,7 @@ static const upb_MiniTableField envoy_config_core_v3_PathConfigSource__fields[2] }; const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = { - &envoy_config_core_v3_PathConfigSource_submsgs[0], + &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 @@ -144,7 +144,7 @@ const upb_MiniTable envoy__config__core__v3__PathConfigSource_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__PathConfigSource_msg_init_ptr = &envoy__config__core__v3__PathConfigSource_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_ConfigSource_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_ConfigSource__submsgs[6] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ApiConfigSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AggregatedConfigSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -165,7 +165,7 @@ static const upb_MiniTableField envoy_config_core_v3_ConfigSource__fields[8] = { }; const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = { - &envoy_config_core_v3_ConfigSource_submsgs[0], + &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 @@ -192,7 +192,7 @@ const upb_MiniTable envoy__config__core__v3__ConfigSource_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__ConfigSource_msg_init_ptr = &envoy__config__core__v3__ConfigSource_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_ExtensionConfigSource_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_ExtensionConfigSource__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -205,7 +205,7 @@ static const upb_MiniTableField envoy_config_core_v3_ExtensionConfigSource__fiel }; const upb_MiniTable envoy__config__core__v3__ExtensionConfigSource_msg_init = { - &envoy_config_core_v3_ExtensionConfigSource_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h index 7120bc2b0b..4683a3aa3a 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/config_source.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_config_source_proto_upb_file #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7150ab1cbc..2820dbcb00 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -113,4 +113,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_core_v3_EventSe #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_H_ */ 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 f330f51862..e5619a34f8 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_EventServiceConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_EventServiceConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_core_v3_EventServiceConfig__fields[ }; const upb_MiniTable envoy__config__core__v3__EventServiceConfig_msg_init = { - &envoy_config_core_v3_EventServiceConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h index 2238246757..d871cce278 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/event_service_config.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_event_service_config_proto_u #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7d8fce0d87..864fb81f6b 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -119,4 +119,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_core_v3_TypedExtensionConfig #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_ */ 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 a04338ed01..ca6bcf349b 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_TypedExtensionConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_TypedExtensionConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_core_v3_TypedExtensionConfig__field }; const upb_MiniTable envoy__config__core__v3__TypedExtensionConfig_msg_init = { - &envoy_config_core_v3_TypedExtensionConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h index a4bc7941b9..4865fd6203 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/extension.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_extension_proto_upb_file_lay #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 d451c4fb9e..bb6c1214d1 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -254,4 +254,4 @@ UPB_INLINE bool envoy_config_core_v3_GrpcMethodList_Service_add_method_names(env #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_H_ */ 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 f4a0f16207..a9d1609cae 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcMethodList_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcMethodList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcMethodList__Service_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcMethodList__fields[1] = }; const upb_MiniTable envoy__config__core__v3__GrpcMethodList_msg_init = { - &envoy_config_core_v3_GrpcMethodList_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h index ab03aa92b8..304286dc5c 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_method_list.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_grpc_method_list_proto_upb_f #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 d4ab962746..8b21b0a1f0 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1892,4 +1892,4 @@ UPB_INLINE void envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntr #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_H_ */ 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 0141f1f2a8..1c91a52c75 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 @@ -24,7 +24,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -41,7 +41,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService__fields[5] = { }; const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = { - &envoy_config_core_v3_GrpcService_submsgs[0], + &envoy_config_core_v3_GrpcService__submsgs[0], &envoy_config_core_v3_GrpcService__fields[0], UPB_SIZE(32, 48), 5, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -60,7 +60,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__GrpcService_msg_init_ptr = &envoy__config__core__v3__GrpcService_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_EnvoyGrpc_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_EnvoyGrpc__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -74,7 +74,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_EnvoyGrpc__fiel }; 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__submsgs[0], &envoy_config_core_v3_GrpcService_EnvoyGrpc__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -93,7 +93,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init_ptr = &envoy__config__core__v3__GrpcService__EnvoyGrpc_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, @@ -113,7 +113,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc__fie }; 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__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 @@ -132,7 +132,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init = }; const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, @@ -145,7 +145,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_SslC }; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init = { - &envoy_config_core_v3_GrpcService_GoogleGrpc_SslCredentials_submsgs[0], + &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 @@ -164,7 +164,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLoca }; const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__SslCredentials_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__GoogleLocalCredentials_msg_init_ptr}, @@ -177,7 +177,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan }; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init = { - &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelCredentials_submsgs[0], + &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 @@ -192,7 +192,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCre }; const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelCredentials_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials__submsgs[5] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__ServiceAccountJWTAccessCredentials_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr}, @@ -211,7 +211,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Call }; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials_msg_init = { - &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_submsgs[0], + &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 @@ -272,7 +272,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden }; const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__GoogleIAMCredentials_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Call }; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__MetadataCredentialsFromPlugin_msg_init = { - &envoy_config_core_v3_GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_submsgs[0], + &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 @@ -337,7 +337,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__CallCreden }; const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__CallCredentials__StsService_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init_ptr}, }; @@ -346,7 +346,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan }; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs_msg_init = { - &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_submsgs[0], + &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 @@ -376,7 +376,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArg }; const upb_MiniTable* envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__Value_msg_init_ptr}, }; @@ -386,7 +386,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcService_GoogleGrpc_Chan }; const upb_MiniTable envoy__config__core__v3__GrpcService__GoogleGrpc__ChannelArgs__ArgsEntry_msg_init = { - &envoy_config_core_v3_GrpcService_GoogleGrpc_ChannelArgs_ArgsEntry_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h index eaf8ab0e68..95d2c3f77a 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/grpc_service.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -55,4 +55,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_grpc_service_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 709a6fb749..eeff9bb0d0 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -2109,4 +2109,4 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_TlsOptions_add_alpn_protocols(e #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_H_ */ 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 93be2c354c..4837da7291 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 @@ -47,7 +47,7 @@ const upb_MiniTable envoy__config__core__v3__HealthStatusSet_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__HealthStatusSet_msg_init_ptr = &envoy__config__core__v3__HealthStatusSet_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_submsgs[21] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck__submsgs[21] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -100,7 +100,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck__fields[25] = { }; const upb_MiniTable envoy__config__core__v3__HealthCheck_msg_init = { - &envoy_config_core_v3_HealthCheck_submsgs[0], + &envoy_config_core_v3_HealthCheck__submsgs[0], &envoy_config_core_v3_HealthCheck__fields[0], UPB_SIZE(112, 184), 25, kUpb_ExtMode_NonExtendable, 9, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -164,7 +164,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__Payload_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr = &envoy__config__core__v3__HealthCheck__Payload_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[7] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_HttpHealthCheck__submsgs[7] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, @@ -190,7 +190,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_HttpHealthCheck }; const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init = { - &envoy_config_core_v3_HealthCheck_HttpHealthCheck_submsgs[0], + &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 @@ -217,7 +217,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_in }; const upb_MiniTable* envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__HttpHealthCheck_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_TcpHealthCheck_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_TcpHealthCheck__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HealthCheck__Payload_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr}, @@ -230,7 +230,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_TcpHealthCheck_ }; 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__submsgs[0], &envoy_config_core_v3_HealthCheck_TcpHealthCheck__fields[0], UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -263,7 +263,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_i }; const upb_MiniTable* envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__RedisHealthCheck_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_GrpcHealthCheck__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, }; @@ -274,7 +274,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_GrpcHealthCheck }; const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init = { - &envoy_config_core_v3_HealthCheck_GrpcHealthCheck_submsgs[0], + &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 @@ -289,7 +289,7 @@ const upb_MiniTable envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_in }; const upb_MiniTable* envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init_ptr = &envoy__config__core__v3__HealthCheck__GrpcHealthCheck_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HealthCheck_CustomHealthCheck__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -299,7 +299,7 @@ static const upb_MiniTableField envoy_config_core_v3_HealthCheck_CustomHealthChe }; const upb_MiniTable envoy__config__core__v3__HealthCheck__CustomHealthCheck_msg_init = { - &envoy_config_core_v3_HealthCheck_CustomHealthCheck_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h index 9078b1706b..60037e1924 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/health_check.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -45,4 +45,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_health_check_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7c72d09e89..e880686abf 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -172,4 +172,4 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_core_v3_H #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_H_ */ 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 eefb3f8629..1df2e0ef75 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_HttpService_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HttpService__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpService__fields[2] = { }; const upb_MiniTable envoy__config__core__v3__HttpService_msg_init = { - &envoy_config_core_v3_HttpService_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h index 46ae377eaf..9848ffa5fa 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_service.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_http_service_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 fa9e97e0e1..ca22ecd5c1 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -149,4 +149,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HttpUri_mutable #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_H_ */ 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 b517bd2919..a106247fd9 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_HttpUri_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HttpUri__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpUri__fields[3] = { }; const upb_MiniTable envoy__config__core__v3__HttpUri_msg_init = { - &envoy_config_core_v3_HttpUri_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h index 143e570ead..9ca02bad1b 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/http_uri.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_http_uri_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 e3cdb76013..115f9b3c71 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -2503,4 +2503,4 @@ UPB_INLINE void envoy_config_core_v3_SchemeHeaderTransformation_set_match_upstre #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_H_ */ 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 8b7df6696d..21bef489a6 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 @@ -33,7 +33,7 @@ const upb_MiniTable envoy__config__core__v3__TcpProtocolOptions_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__TcpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__TcpProtocolOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_QuicKeepAliveSettings_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_QuicKeepAliveSettings__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -44,7 +44,7 @@ static const upb_MiniTableField envoy_config_core_v3_QuicKeepAliveSettings__fiel }; const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = { - &envoy_config_core_v3_QuicKeepAliveSettings_submsgs[0], + &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 @@ -53,7 +53,7 @@ const upb_MiniTable envoy__config__core__v3__QuicKeepAliveSettings_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__QuicKeepAliveSettings_msg_init_ptr = &envoy__config__core__v3__QuicKeepAliveSettings_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_QuicProtocolOptions_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_QuicProtocolOptions__submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -74,7 +74,7 @@ static const upb_MiniTableField envoy_config_core_v3_QuicProtocolOptions__fields }; const upb_MiniTable envoy__config__core__v3__QuicProtocolOptions_msg_init = { - &envoy_config_core_v3_QuicProtocolOptions_submsgs[0], + &envoy_config_core_v3_QuicProtocolOptions__submsgs[0], &envoy_config_core_v3_QuicProtocolOptions__fields[0], UPB_SIZE(56, 96), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -115,7 +115,7 @@ const upb_MiniTable envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_ini }; const upb_MiniTable* envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_AlternateProtocolsCacheOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr}, @@ -130,7 +130,7 @@ static const upb_MiniTableField envoy_config_core_v3_AlternateProtocolsCacheOpti }; const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions_msg_init = { - &envoy_config_core_v3_AlternateProtocolsCacheOptions_submsgs[0], + &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 @@ -170,7 +170,7 @@ const upb_MiniTable envoy__config__core__v3__AlternateProtocolsCacheOptions__Alt }; const upb_MiniTable* envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init_ptr = &envoy__config__core__v3__AlternateProtocolsCacheOptions__AlternateProtocolsCacheEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_HttpProtocolOptions_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_HttpProtocolOptions__submsgs[5] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -188,7 +188,7 @@ static const upb_MiniTableField envoy_config_core_v3_HttpProtocolOptions__fields }; const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = { - &envoy_config_core_v3_HttpProtocolOptions_submsgs[0], + &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 @@ -207,7 +207,7 @@ const upb_MiniTable envoy__config__core__v3__HttpProtocolOptions_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr = &envoy__config__core__v3__HttpProtocolOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, @@ -228,7 +228,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions__field }; const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = { - &envoy_config_core_v3_Http1ProtocolOptions_submsgs[0], + &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 @@ -255,7 +255,7 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -266,7 +266,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http1ProtocolOptions_Header }; const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat_msg_init = { - &envoy_config_core_v3_Http1ProtocolOptions_HeaderKeyFormat_submsgs[0], + &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 @@ -303,7 +303,7 @@ const upb_MiniTable envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyForm }; const upb_MiniTable* envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init_ptr = &envoy__config__core__v3__Http1ProtocolOptions__HeaderKeyFormat__ProperCaseWords_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_KeepaliveSettings_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_KeepaliveSettings__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, @@ -318,7 +318,7 @@ static const upb_MiniTableField envoy_config_core_v3_KeepaliveSettings__fields[4 }; const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = { - &envoy_config_core_v3_KeepaliveSettings_submsgs[0], + &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 @@ -327,7 +327,7 @@ const upb_MiniTable envoy__config__core__v3__KeepaliveSettings_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__KeepaliveSettings_msg_init_ptr = &envoy__config__core__v3__KeepaliveSettings_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_submsgs[13] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions__submsgs[13] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -363,7 +363,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions__field }; const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = { - &envoy_config_core_v3_Http2ProtocolOptions_submsgs[0], + &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 @@ -390,7 +390,7 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr = &envoy__config__core__v3__Http2ProtocolOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -401,7 +401,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http2ProtocolOptions_Settin }; const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init = { - &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_submsgs[0], + &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 @@ -410,7 +410,7 @@ const upb_MiniTable envoy__config__core__v3__Http2ProtocolOptions__SettingsParam }; const upb_MiniTable* envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init_ptr = &envoy__config__core__v3__Http2ProtocolOptions__SettingsParameter_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcProtocolOptions_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_GrpcProtocolOptions__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, }; @@ -419,7 +419,7 @@ static const upb_MiniTableField envoy_config_core_v3_GrpcProtocolOptions__fields }; const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = { - &envoy_config_core_v3_GrpcProtocolOptions_submsgs[0], + &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 @@ -428,7 +428,7 @@ const upb_MiniTable envoy__config__core__v3__GrpcProtocolOptions_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__GrpcProtocolOptions_msg_init_ptr = &envoy__config__core__v3__GrpcProtocolOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_Http3ProtocolOptions_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_Http3ProtocolOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -441,7 +441,7 @@ static const upb_MiniTableField envoy_config_core_v3_Http3ProtocolOptions__field }; const upb_MiniTable envoy__config__core__v3__Http3ProtocolOptions_msg_init = { - &envoy_config_core_v3_Http3ProtocolOptions_submsgs[0], + &envoy_config_core_v3_Http3ProtocolOptions__submsgs[0], &envoy_config_core_v3_Http3ProtocolOptions__fields[0], UPB_SIZE(24, 32), 4, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h index 81ce39069f..2de89c7585 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/protocol.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -59,4 +59,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_protocol_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 69bfb16709..433b249b96 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -242,4 +242,4 @@ UPB_INLINE struct envoy_config_core_v3_ProxyProtocolPassThroughTLVs* envoy_confi #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_H_ */ 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 518271704a..5193d9d6be 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 @@ -37,7 +37,7 @@ const upb_MiniTable envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_in }; const upb_MiniTable* envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_ProxyProtocolConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_ProxyProtocolConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolPassThroughTLVs_msg_init_ptr}, }; @@ -47,7 +47,7 @@ static const upb_MiniTableField envoy_config_core_v3_ProxyProtocolConfig__fields }; const upb_MiniTable envoy__config__core__v3__ProxyProtocolConfig_msg_init = { - &envoy_config_core_v3_ProxyProtocolConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h index a0a769b6f0..691a3a276d 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/proxy_protocol.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_proxy_protocol_proto_upb_fil #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 9b745f5d10..3cf3c7fb0c 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -241,4 +241,4 @@ UPB_INLINE struct envoy_config_core_v3_DnsResolverOptions* envoy_config_core_v3_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_H_ */ 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 d51a499305..ab69ebeea1 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 @@ -38,7 +38,7 @@ const upb_MiniTable envoy__config__core__v3__DnsResolverOptions_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__DnsResolverOptions_msg_init_ptr = &envoy__config__core__v3__DnsResolverOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_DnsResolutionConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_DnsResolutionConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DnsResolverOptions_msg_init_ptr}, }; @@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_core_v3_DnsResolutionConfig__fields }; const upb_MiniTable envoy__config__core__v3__DnsResolutionConfig_msg_init = { - &envoy_config_core_v3_DnsResolutionConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h index 11224a9955..45dc183b07 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/resolver.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_resolver_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 de96ce4954..fb1a1753f1 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -298,4 +298,4 @@ UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_core_v3_Socket #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_H_ */ 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 8b75d1e6aa..2b98b4db4f 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 @@ -46,7 +46,7 @@ const upb_MiniTable envoy__config__core__v3__SocketOption_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__SocketOption_msg_init_ptr = &envoy__config__core__v3__SocketOption_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_SocketOptionsOverride_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_SocketOptionsOverride__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOption_msg_init_ptr}, }; @@ -55,7 +55,7 @@ static const upb_MiniTableField envoy_config_core_v3_SocketOptionsOverride__fiel }; const upb_MiniTable envoy__config__core__v3__SocketOptionsOverride_msg_init = { - &envoy_config_core_v3_SocketOptionsOverride_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h index c65b232123..a41e250e2e 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/socket_option.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_socket_option_proto_upb_file #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 0442752ab6..c83d226fe9 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -353,4 +353,4 @@ UPB_INLINE struct envoy_config_core_v3_JsonFormatOptions* envoy_config_core_v3_S #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_H_ */ 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 ce65701fd0..6c69add4b2 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 @@ -38,7 +38,7 @@ const upb_MiniTable envoy__config__core__v3__JsonFormatOptions_msg_init = { }; const upb_MiniTable* envoy__config__core__v3__JsonFormatOptions_msg_init_ptr = &envoy__config__core__v3__JsonFormatOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_core_v3_SubstitutionFormatString_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_SubstitutionFormatString__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, @@ -56,7 +56,7 @@ static const upb_MiniTableField envoy_config_core_v3_SubstitutionFormatString__f }; const upb_MiniTable envoy__config__core__v3__SubstitutionFormatString_msg_init = { - &envoy_config_core_v3_SubstitutionFormatString_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h index a18cc1b1e0..14f36ea476 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/substitution_format_string.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_substitution_format_string_p #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 1de84f71b5..5df933672c 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_ -#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -134,4 +134,4 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_UdpSocketConfi #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_H_ */ 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 9867e78b4f..301421ee2d 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_core_v3_UdpSocketConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_core_v3_UdpSocketConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_config_core_v3_UdpSocketConfig__fields[2] }; const upb_MiniTable envoy__config__core__v3__UdpSocketConfig_msg_init = { - &envoy_config_core_v3_UdpSocketConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h index 670fee212a..0a9d22805e 100644 --- a/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/core/v3/udp_socket_config.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_core_v3_udp_socket_config_proto_upb_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 47b95a2bfd..69184e862a 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -549,4 +549,4 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEnt #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_H_ */ 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 efdce57ee2..a887b85ebd 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 @@ -21,7 +21,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init_ptr}, @@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment__ }; const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init = { - &envoy_config_endpoint_v3_ClusterLoadAssignment_submsgs[0], + &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 @@ -50,7 +50,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init }; const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -64,7 +64,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_P }; const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init = { - &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_submsgs[0], + &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 @@ -83,7 +83,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_m }; const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, }; @@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_P }; const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init = { - &envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload_submsgs[0], + &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 @@ -106,7 +106,7 @@ const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__ }; const upb_MiniTable* envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init_ptr = &envoy__config__endpoint__v3__ClusterLoadAssignment__Policy__DropOverload_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init_ptr}, }; @@ -116,7 +116,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterLoadAssignment_N }; const upb_MiniTable envoy__config__endpoint__v3__ClusterLoadAssignment__NamedEndpointsEntry_msg_init = { - &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h index dfeb1d9f68..aa1a7e36e8 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 787315ed41..bbba5d52e9 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1089,4 +1089,4 @@ UPB_INLINE struct envoy_config_endpoint_v3_LbEndpoint* envoy_config_endpoint_v3_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_H_ */ 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 ee22570993..13871d1915 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 @@ -22,7 +22,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr}, @@ -36,7 +36,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint__fields[4] = { }; const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = { - &envoy_config_endpoint_v3_Endpoint_submsgs[0], + &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 @@ -55,7 +55,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint_msg_init = { }; const upb_MiniTable* envoy__config__endpoint__v3__Endpoint_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_HealthCheckConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, }; @@ -67,7 +67,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_HealthCheckCon }; const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init = { - &envoy_config_endpoint_v3_Endpoint_HealthCheckConfig_submsgs[0], + &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 @@ -86,7 +86,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg }; const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint__HealthCheckConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_Endpoint_AdditionalAddress__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, }; @@ -95,7 +95,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_Endpoint_AdditionalAddr }; const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init = { - &envoy_config_endpoint_v3_Endpoint_AdditionalAddress_submsgs[0], + &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 @@ -104,7 +104,7 @@ const upb_MiniTable envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg }; const upb_MiniTable* envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init_ptr = &envoy__config__endpoint__v3__Endpoint__AdditionalAddress_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LbEndpoint_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LbEndpoint__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__Endpoint_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -119,7 +119,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LbEndpoint__fields[5] = }; const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = { - &envoy_config_endpoint_v3_LbEndpoint_submsgs[0], + &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 @@ -138,7 +138,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LbEndpoint_msg_init = { }; const upb_MiniTable* envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr = &envoy__config__endpoint__v3__LbEndpoint_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LedsClusterLocalityConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; @@ -148,7 +148,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LedsClusterLocalityConf }; const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init = { - &envoy_config_endpoint_v3_LedsClusterLocalityConfig_submsgs[0], + &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 @@ -163,7 +163,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_i }; const upb_MiniTable* envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init_ptr = &envoy__config__endpoint__v3__LedsClusterLocalityConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[7] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints__submsgs[7] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -185,7 +185,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints__fi }; const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = { - &envoy_config_endpoint_v3_LocalityLbEndpoints_submsgs[0], + &envoy_config_endpoint_v3_LocalityLbEndpoints__submsgs[0], &envoy_config_endpoint_v3_LocalityLbEndpoints__fields[0], UPB_SIZE(48, 72), 8, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -212,7 +212,7 @@ const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init = }; const upb_MiniTable* envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init_ptr = &envoy__config__endpoint__v3__LocalityLbEndpoints_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__LbEndpoint_msg_init_ptr}, }; @@ -221,7 +221,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_LocalityLbEndpoints_LbE }; const upb_MiniTable envoy__config__endpoint__v3__LocalityLbEndpoints__LbEndpointList_msg_init = { - &envoy_config_endpoint_v3_LocalityLbEndpoints_LbEndpointList_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h index 4b1b2f6633..b1df0cfea0 100644 --- a/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/endpoint/v3/endpoint_components.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_config_endpoint_v3_endpoint_components_prot #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 5594fea323..7b58751f9f 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1173,4 +1173,4 @@ UPB_INLINE void envoy_config_endpoint_v3_ClusterStats_DroppedRequests_set_droppe #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_H_ */ 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 71df180686..52a09f2855 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 @@ -22,7 +22,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamLocalityStats__submsgs[6] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Locality_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init_ptr}, @@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamLocalityStats__ }; const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init = { - &envoy_config_endpoint_v3_UpstreamLocalityStats_submsgs[0], + &envoy_config_endpoint_v3_UpstreamLocalityStats__submsgs[0], &envoy_config_endpoint_v3_UpstreamLocalityStats__fields[0], UPB_SIZE(96, 120), 14, kUpb_ExtMode_NonExtendable, 14, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -76,7 +76,7 @@ const upb_MiniTable envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init }; const upb_MiniTable* envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_UpstreamEndpointStats__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__EndpointLoadMetricStats_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, @@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_UpstreamEndpointStats__ }; const upb_MiniTable envoy__config__endpoint__v3__UpstreamEndpointStats_msg_init = { - &envoy_config_endpoint_v3_UpstreamEndpointStats_submsgs[0], + &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 @@ -155,7 +155,7 @@ const upb_MiniTable envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_ }; const upb_MiniTable* envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init_ptr = &envoy__config__endpoint__v3__UnnamedEndpointLoadMetricStats_msg_init; -static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterStats_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_endpoint_v3_ClusterStats__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__UpstreamLocalityStats_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats__DroppedRequests_msg_init_ptr}, @@ -171,7 +171,7 @@ static const upb_MiniTableField envoy_config_endpoint_v3_ClusterStats__fields[6] }; const upb_MiniTable envoy__config__endpoint__v3__ClusterStats_msg_init = { - &envoy_config_endpoint_v3_ClusterStats_submsgs[0], + &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 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 2cd4049e32..68d4c6caaa 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -39,4 +39,4 @@ extern const upb_MiniTableFile envoy_config_endpoint_v3_load_report_proto_upb_fi #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 23a268a85a..fc85a2437a 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_ -#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -103,4 +103,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_ApiListener_muta #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_H_ */ 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 857456f690..7d876a750e 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_listener_v3_ApiListener_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_ApiListener__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ApiListener__fields[1] }; const upb_MiniTable envoy__config__listener__v3__ApiListener_msg_init = { - &envoy_config_listener_v3_ApiListener_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h index 29d6a53f75..c53c45ce4f 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/api_listener.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_api_listener_proto_upb_f #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 64ff9d5818..79d9ac7aa4 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_ -#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1743,4 +1743,4 @@ UPB_INLINE char* envoy_config_listener_v3_ApiListenerManager_serialize_ex(const #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_H_ */ 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 5b19dd1bc5..3eb7ebd769 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 @@ -32,7 +32,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_listener_v3_AdditionalAddress_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_AdditionalAddress__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketOptionsOverride_msg_init_ptr}, }; @@ -43,7 +43,7 @@ static const upb_MiniTableField envoy_config_listener_v3_AdditionalAddress__fiel }; const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = { - &envoy_config_listener_v3_AdditionalAddress_submsgs[0], + &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 @@ -52,7 +52,7 @@ const upb_MiniTable envoy__config__listener__v3__AdditionalAddress_msg_init = { }; const upb_MiniTable* envoy__config__listener__v3__AdditionalAddress_msg_init_ptr = &envoy__config__listener__v3__AdditionalAddress_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerCollection_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerCollection__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry_msg_init_ptr}, }; @@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerCollection__fie }; const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = { - &envoy_config_listener_v3_ListenerCollection_submsgs[0], + &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 @@ -74,7 +74,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerCollection_msg_init = { }; const upb_MiniTable* envoy__config__listener__v3__ListenerCollection_msg_init_ptr = &envoy__config__listener__v3__ListenerCollection_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_submsgs[24] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener__submsgs[24] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChain_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, @@ -138,7 +138,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener__fields[33] = }; const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = { - &envoy_config_listener_v3_Listener_submsgs[0], + &envoy_config_listener_v3_Listener__submsgs[0], &envoy_config_listener_v3_Listener__fields[0], UPB_SIZE(152, 256), 33, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -181,7 +181,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener_msg_init = { }; const upb_MiniTable* envoy__config__listener__v3__Listener_msg_init_ptr = &envoy__config__listener__v3__Listener_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_DeprecatedV1__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -190,7 +190,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener_DeprecatedV1__ }; 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__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 @@ -199,7 +199,7 @@ const upb_MiniTable envoy__config__listener__v3__Listener__DeprecatedV1_msg_init }; const upb_MiniTable* envoy__config__listener__v3__Listener__DeprecatedV1_msg_init_ptr = &envoy__config__listener__v3__Listener__DeprecatedV1_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_Listener_ConnectionBalanceConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Listener__ConnectionBalanceConfig__ExactBalance_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -210,7 +210,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Listener_ConnectionBala }; const upb_MiniTable envoy__config__listener__v3__Listener__ConnectionBalanceConfig_msg_init = { - &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h index 7e125b19f3..dd21194775 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -47,4 +47,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_listener_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 4257dc6236..60c104450c 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_ -#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1533,4 +1533,4 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_liste #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_H_ */ 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 36d5e3897b..5e863a4d7f 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 @@ -25,7 +25,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_listener_v3_Filter_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_Filter__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr}, }; @@ -37,7 +37,7 @@ static const upb_MiniTableField envoy_config_listener_v3_Filter__fields[3] = { }; const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = { - &envoy_config_listener_v3_Filter_submsgs[0], + &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 @@ -56,7 +56,7 @@ const upb_MiniTable envoy__config__listener__v3__Filter_msg_init = { }; const upb_MiniTable* envoy__config__listener__v3__Filter_msg_init_ptr = &envoy__config__listener__v3__Filter_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChainMatch_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChainMatch__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, @@ -79,7 +79,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChainMatch__field }; const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = { - &envoy_config_listener_v3_FilterChainMatch_submsgs[0], + &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 @@ -106,7 +106,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChainMatch_msg_init = { }; const upb_MiniTable* envoy__config__listener__v3__FilterChainMatch_msg_init_ptr = &envoy__config__listener__v3__FilterChainMatch_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_submsgs[7] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain__submsgs[7] = { {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__FilterChainMatch_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__Filter_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, @@ -128,7 +128,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChain__fields[8] }; const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = { - &envoy_config_listener_v3_FilterChain_submsgs[0], + &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 @@ -147,7 +147,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain_msg_init = { }; const upb_MiniTable* envoy__config__listener__v3__FilterChain_msg_init_ptr = &envoy__config__listener__v3__FilterChain_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_FilterChain_OnDemandConfiguration__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -156,7 +156,7 @@ static const upb_MiniTableField envoy_config_listener_v3_FilterChain_OnDemandCon }; const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init = { - &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[0], + &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 @@ -165,7 +165,7 @@ const upb_MiniTable envoy__config__listener__v3__FilterChain__OnDemandConfigurat }; const upb_MiniTable* envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init_ptr = &envoy__config__listener__v3__FilterChain__OnDemandConfiguration_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr}, @@ -181,7 +181,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatc }; const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init = { - &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_submsgs[0], + &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 @@ -200,7 +200,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica }; const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr}, }; @@ -209,7 +209,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilterChainMatc }; const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init = { - &envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_submsgs[0], + &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 @@ -222,7 +222,7 @@ const upb_MiniTable envoy__config__listener__v3__ListenerFilterChainMatchPredica }; const upb_MiniTable* envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init_ptr = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate__MatchSet_msg_init; -static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilter_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_ListenerFilter__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__ListenerFilterChainMatchPredicate_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr}, @@ -236,7 +236,7 @@ static const upb_MiniTableField envoy_config_listener_v3_ListenerFilter__fields[ }; const upb_MiniTable envoy__config__listener__v3__ListenerFilter_msg_init = { - &envoy_config_listener_v3_ListenerFilter_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h index d4c6ff64e2..581cde3b52 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/listener_components.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_listener_components_prot #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 ac4d3f0042..ad6f16aebb 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_ -#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -414,4 +414,4 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_H_ */ 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 8556c90dd0..6c5277f4bf 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 @@ -23,7 +23,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_listener_v3_QuicProtocolOptions_submsgs[11] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_QuicProtocolOptions__submsgs[11] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__QuicProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -52,7 +52,7 @@ static const upb_MiniTableField envoy_config_listener_v3_QuicProtocolOptions__fi }; const upb_MiniTable envoy__config__listener__v3__QuicProtocolOptions_msg_init = { - &envoy_config_listener_v3_QuicProtocolOptions_submsgs[0], + &envoy_config_listener_v3_QuicProtocolOptions__submsgs[0], &envoy_config_listener_v3_QuicProtocolOptions__fields[0], UPB_SIZE(56, 104), 11, kUpb_ExtMode_NonExtendable, 11, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h index c9007f487d..bd788c2b64 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/quic_config.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_quic_config_proto_upb_fi #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 94b16291c8..8275ea5a72 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_ -#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -206,4 +206,4 @@ UPB_INLINE char* envoy_config_listener_v3_ActiveRawUdpListenerConfig_serialize_e #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_H_ */ 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 6570ad43fa..77b1c7bf33 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_listener_v3_UdpListenerConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_listener_v3_UdpListenerConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UdpSocketConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__listener__v3__QuicProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, @@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_config_listener_v3_UdpListenerConfig__fiel }; const upb_MiniTable envoy__config__listener__v3__UdpListenerConfig_msg_init = { - &envoy_config_listener_v3_UdpListenerConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h index e998a4fd97..0cb4fc7f86 100644 --- a/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/listener/v3/udp_listener_config.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_listener_v3_udp_listener_config_prot #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 b7ffb1c62f..ddc9ca95e2 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_ -#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -191,4 +191,4 @@ UPB_INLINE void envoy_config_metrics_v3_MetricsServiceConfig_set_histogram_emit_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_H_ */ 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 669b310608..3fcdf58bd4 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_metrics_v3_MetricsServiceConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_metrics_v3_MetricsServiceConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -34,7 +34,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_MetricsServiceConfig__fi }; const upb_MiniTable envoy__config__metrics__v3__MetricsServiceConfig_msg_init = { - &envoy_config_metrics_v3_MetricsServiceConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h index 3b8ec578b2..4fbc721a7b 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/metrics_service.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_metrics_v3_metrics_service_proto_upb #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 2d06ee4d3b..176a231acf 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ -#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1028,4 +1028,4 @@ UPB_INLINE void envoy_config_metrics_v3_HystrixSink_set_num_buckets(envoy_config #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_H_ */ 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 87436173c5..c17d4f41ce 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 @@ -21,7 +21,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsSink_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsSink__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsSink__fields[2] = { }; const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = { - &envoy_config_metrics_v3_StatsSink_submsgs[0], + &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 @@ -46,7 +46,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsSink_msg_init = { }; const upb_MiniTable* envoy__config__metrics__v3__StatsSink_msg_init_ptr = &envoy__config__metrics__v3__StatsSink_msg_init; -static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsConfig_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsConfig__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__TagSpecifier_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__metrics__v3__StatsMatcher_msg_init_ptr}, @@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsConfig__fields[4] = }; const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = { - &envoy_config_metrics_v3_StatsConfig_submsgs[0], + &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 @@ -80,7 +80,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsConfig_msg_init = { }; const upb_MiniTable* envoy__config__metrics__v3__StatsConfig_msg_init_ptr = &envoy__config__metrics__v3__StatsConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ListStringMatcher_msg_init_ptr}, }; @@ -92,7 +92,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsMatcher__fields[3] }; const upb_MiniTable envoy__config__metrics__v3__StatsMatcher_msg_init = { - &envoy_config_metrics_v3_StatsMatcher_submsgs[0], + &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 @@ -129,7 +129,7 @@ const upb_MiniTable envoy__config__metrics__v3__TagSpecifier_msg_init = { }; const upb_MiniTable* envoy__config__metrics__v3__TagSpecifier_msg_init_ptr = &envoy__config__metrics__v3__TagSpecifier_msg_init; -static const upb_MiniTableSubInternal envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_metrics_v3_HistogramBucketSettings__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; @@ -139,7 +139,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_HistogramBucketSettings_ }; const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init = { - &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0], + &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 @@ -154,7 +154,7 @@ const upb_MiniTable envoy__config__metrics__v3__HistogramBucketSettings_msg_init }; const upb_MiniTable* envoy__config__metrics__v3__HistogramBucketSettings_msg_init_ptr = &envoy__config__metrics__v3__HistogramBucketSettings_msg_init; -static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsdSink_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_metrics_v3_StatsdSink__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, }; @@ -165,7 +165,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_StatsdSink__fields[3] = }; const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = { - &envoy_config_metrics_v3_StatsdSink_submsgs[0], + &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 @@ -180,7 +180,7 @@ const upb_MiniTable envoy__config__metrics__v3__StatsdSink_msg_init = { }; const upb_MiniTable* envoy__config__metrics__v3__StatsdSink_msg_init_ptr = &envoy__config__metrics__v3__StatsdSink_msg_init; -static const upb_MiniTableSubInternal envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_metrics_v3_DogStatsdSink__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; @@ -192,7 +192,7 @@ static const upb_MiniTableField envoy_config_metrics_v3_DogStatsdSink__fields[3] }; const upb_MiniTable envoy__config__metrics__v3__DogStatsdSink_msg_init = { - &envoy_config_metrics_v3_DogStatsdSink_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h index f27f3f4ed8..5ebc8d7914 100644 --- a/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/metrics/v3/stats.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -43,4 +43,4 @@ extern const upb_MiniTableFile envoy_config_metrics_v3_stats_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 dfff896252..49620f701b 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ -#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1251,4 +1251,4 @@ UPB_INLINE struct envoy_config_overload_v3_LoadShedPoint* envoy_config_overload_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_H_ */ 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 b17c6021f0..5d406181b9 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_overload_v3_ResourceMonitor_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_overload_v3_ResourceMonitor__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ResourceMonitor__fields }; const upb_MiniTable envoy__config__overload__v3__ResourceMonitor_msg_init = { - &envoy_config_overload_v3_ResourceMonitor_submsgs[0], + &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 @@ -84,7 +84,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaledTrigger_msg_init = { }; const upb_MiniTable* envoy__config__overload__v3__ScaledTrigger_msg_init_ptr = &envoy__config__overload__v3__ScaledTrigger_msg_init; -static const upb_MiniTableSubInternal envoy_config_overload_v3_Trigger_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_overload_v3_Trigger__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ThresholdTrigger_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaledTrigger_msg_init_ptr}, }; @@ -96,7 +96,7 @@ static const upb_MiniTableField envoy_config_overload_v3_Trigger__fields[3] = { }; const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = { - &envoy_config_overload_v3_Trigger_submsgs[0], + &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 @@ -111,7 +111,7 @@ const upb_MiniTable envoy__config__overload__v3__Trigger_msg_init = { }; const upb_MiniTable* envoy__config__overload__v3__Trigger_msg_init_ptr = &envoy__config__overload__v3__Trigger_msg_init; -static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr}, }; @@ -120,7 +120,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActi }; const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init = { - &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0], + &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 @@ -133,7 +133,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig }; const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init_ptr = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, }; @@ -145,7 +145,7 @@ static const upb_MiniTableField envoy_config_overload_v3_ScaleTimersOverloadActi }; const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init = { - &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0], + &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 @@ -160,7 +160,7 @@ const upb_MiniTable envoy__config__overload__v3__ScaleTimersOverloadActionConfig }; const upb_MiniTable* envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init_ptr = &envoy__config__overload__v3__ScaleTimersOverloadActionConfig__ScaleTimer_msg_init; -static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadAction_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadAction__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -172,7 +172,7 @@ static const upb_MiniTableField envoy_config_overload_v3_OverloadAction__fields[ }; const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = { - &envoy_config_overload_v3_OverloadAction_submsgs[0], + &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 @@ -187,7 +187,7 @@ const upb_MiniTable envoy__config__overload__v3__OverloadAction_msg_init = { }; const upb_MiniTable* envoy__config__overload__v3__OverloadAction_msg_init_ptr = &envoy__config__overload__v3__OverloadAction_msg_init; -static const upb_MiniTableSubInternal envoy_config_overload_v3_LoadShedPoint_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_overload_v3_LoadShedPoint__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__Trigger_msg_init_ptr}, }; @@ -197,7 +197,7 @@ static const upb_MiniTableField envoy_config_overload_v3_LoadShedPoint__fields[2 }; const upb_MiniTable envoy__config__overload__v3__LoadShedPoint_msg_init = { - &envoy_config_overload_v3_LoadShedPoint_submsgs[0], + &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 @@ -230,7 +230,7 @@ const upb_MiniTable envoy__config__overload__v3__BufferFactoryConfig_msg_init = }; const upb_MiniTable* envoy__config__overload__v3__BufferFactoryConfig_msg_init_ptr = &envoy__config__overload__v3__BufferFactoryConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadManager_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_overload_v3_OverloadManager__submsgs[5] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__ResourceMonitor_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__overload__v3__OverloadAction_msg_init_ptr}, @@ -247,7 +247,7 @@ static const upb_MiniTableField envoy_config_overload_v3_OverloadManager__fields }; const upb_MiniTable envoy__config__overload__v3__OverloadManager_msg_init = { - &envoy_config_overload_v3_OverloadManager_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h index e91a7a06ff..f6a5dcb55b 100644 --- a/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/overload/v3/overload.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -47,4 +47,4 @@ extern const upb_MiniTableFile envoy_config_overload_v3_overload_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 abfdd76f19..917735b7af 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ -#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1872,4 +1872,4 @@ UPB_INLINE void envoy_config_rbac_v3_Action_set_action(envoy_config_rbac_v3_Acti #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ */ 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 fbcde8c9a8..0271d9071e 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 @@ -29,7 +29,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr}, }; @@ -41,7 +41,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC__fields[3] = { }; const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = { - &envoy_config_rbac_v3_RBAC_submsgs[0], + &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 @@ -54,7 +54,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC_msg_init = { }; const upb_MiniTable* envoy__config__rbac__v3__RBAC_msg_init_ptr = &envoy__config__rbac__v3__RBAC_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr}, }; @@ -64,7 +64,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions__f }; 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__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 @@ -79,7 +79,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init }; const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init_ptr = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -89,7 +89,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_AuditLoggingOptions_Au }; const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init = { - &envoy_config_rbac_v3_RBAC_AuditLoggingOptions_AuditLoggerConfig_submsgs[0], + &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 @@ -104,7 +104,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLog }; const upb_MiniTable* envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init_ptr = &envoy__config__rbac__v3__RBAC__AuditLoggingOptions__AuditLoggerConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_PoliciesEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_RBAC_PoliciesEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Policy_msg_init_ptr}, }; @@ -114,7 +114,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_RBAC_PoliciesEntry__fields[ }; 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__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 @@ -127,7 +127,7 @@ const upb_MiniTable envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init = { }; const upb_MiniTable* envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init_ptr = &envoy__config__rbac__v3__RBAC__PoliciesEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_Policy_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Policy__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, @@ -142,7 +142,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Policy__fields[4] = { }; const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = { - &envoy_config_rbac_v3_Policy_submsgs[0], + &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 @@ -157,7 +157,7 @@ const upb_MiniTable envoy__config__rbac__v3__Policy_msg_init = { }; const upb_MiniTable* envoy__config__rbac__v3__Policy_msg_init_ptr = &envoy__config__rbac__v3__Policy_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_submsgs[11] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission__submsgs[11] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission__Set_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, @@ -188,7 +188,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Permission__fields[13] = { }; const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = { - &envoy_config_rbac_v3_Permission_submsgs[0], + &envoy_config_rbac_v3_Permission__submsgs[0], &envoy_config_rbac_v3_Permission__fields[0], UPB_SIZE(16, 24), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -215,7 +215,7 @@ const upb_MiniTable envoy__config__rbac__v3__Permission_msg_init = { }; const upb_MiniTable* envoy__config__rbac__v3__Permission_msg_init_ptr = &envoy__config__rbac__v3__Permission_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_Set_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Permission_Set__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Permission_msg_init_ptr}, }; @@ -224,7 +224,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Permission_Set__fields[1] = }; 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__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 @@ -237,7 +237,7 @@ const upb_MiniTable envoy__config__rbac__v3__Permission__Set_msg_init = { }; const upb_MiniTable* envoy__config__rbac__v3__Permission__Set_msg_init_ptr = &envoy__config__rbac__v3__Permission__Set_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_submsgs[11] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal__submsgs[11] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Set_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal__Authenticated_msg_init_ptr}, @@ -267,7 +267,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal__fields[12] = { }; const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = { - &envoy_config_rbac_v3_Principal_submsgs[0], + &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 @@ -294,7 +294,7 @@ const upb_MiniTable envoy__config__rbac__v3__Principal_msg_init = { }; const upb_MiniTable* envoy__config__rbac__v3__Principal_msg_init_ptr = &envoy__config__rbac__v3__Principal_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Set_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Set__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__Principal_msg_init_ptr}, }; @@ -303,7 +303,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal_Set__fields[1] = }; 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__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 @@ -316,7 +316,7 @@ const upb_MiniTable envoy__config__rbac__v3__Principal__Set_msg_init = { }; const upb_MiniTable* envoy__config__rbac__v3__Principal__Set_msg_init_ptr = &envoy__config__rbac__v3__Principal__Set_msg_init; -static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Authenticated_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_rbac_v3_Principal_Authenticated__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; @@ -325,7 +325,7 @@ static const upb_MiniTableField envoy_config_rbac_v3_Principal_Authenticated__fi }; 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__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 diff --git a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h index 0c40e3a57f..dbb797c5fa 100644 --- a/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/rbac/v3/rbac.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -49,4 +49,4 @@ extern const upb_MiniTableFile envoy_config_rbac_v3_rbac_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 25ae4043ea..9c32f40a4f 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_ -#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -942,4 +942,4 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_route_v3_Vhds_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_H_ */ 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 44b3a48007..4c8df18368 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 @@ -22,7 +22,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration_submsgs[10] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration__submsgs[10] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualHost_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, @@ -56,7 +56,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration__fields }; const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init = { - &envoy_config_route_v3_RouteConfiguration_submsgs[0], + &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 @@ -83,7 +83,7 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__RouteConfiguration_msg_init_ptr = &envoy__config__route__v3__RouteConfiguration_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteConfiguration_TypedPe }; const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init = { - &envoy_config_route_v3_RouteConfiguration_TypedPerFilterConfigEntry_submsgs[0], + &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 @@ -106,7 +106,7 @@ const upb_MiniTable envoy__config__route__v3__RouteConfiguration__TypedPerFilter }; const upb_MiniTable* envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__RouteConfiguration__TypedPerFilterConfigEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_Vhds_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_Vhds__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; @@ -115,7 +115,7 @@ static const upb_MiniTableField envoy_config_route_v3_Vhds__fields[1] = { }; const upb_MiniTable envoy__config__route__v3__Vhds_msg_init = { - &envoy_config_route_v3_Vhds_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h index 0005b2b502..bf5b5620ec 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_config_route_v3_route_proto_upb_file_layout #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 e5bb26b657..0344c7f8d5 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_ -#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -10488,4 +10488,4 @@ UPB_INLINE void envoy_config_route_v3_FilterConfig_set_disabled(envoy_config_rou #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_H_ */ 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 710fbc5cf7..899cb9421e 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 @@ -34,7 +34,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost_submsgs[14] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost__submsgs[14] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__VirtualCluster_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit_msg_init_ptr}, @@ -77,7 +77,7 @@ static const upb_MiniTableField envoy_config_route_v3_VirtualHost__fields[22] = }; const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init = { - &envoy_config_route_v3_VirtualHost_submsgs[0], + &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 @@ -120,7 +120,7 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__VirtualHost_msg_init_ptr = &envoy__config__route__v3__VirtualHost_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -130,7 +130,7 @@ static const upb_MiniTableField envoy_config_route_v3_VirtualHost_TypedPerFilter }; const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init = { - &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_submsgs[0], + &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 @@ -143,7 +143,7 @@ const upb_MiniTable envoy__config__route__v3__VirtualHost__TypedPerFilterConfigE }; const upb_MiniTable* envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__VirtualHost__TypedPerFilterConfigEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_FilterAction_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_FilterAction__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -152,7 +152,7 @@ static const upb_MiniTableField envoy_config_route_v3_FilterAction__fields[1] = }; const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init = { - &envoy_config_route_v3_FilterAction_submsgs[0], + &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 @@ -161,7 +161,7 @@ const upb_MiniTable envoy__config__route__v3__FilterAction_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__FilterAction_msg_init_ptr = &envoy__config__route__v3__FilterAction_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteList_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__Route_msg_init_ptr}, }; @@ -170,7 +170,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteList__fields[1] = { }; const upb_MiniTable envoy__config__route__v3__RouteList_msg_init = { - &envoy_config_route_v3_RouteList_submsgs[0], + &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 @@ -183,7 +183,7 @@ const upb_MiniTable envoy__config__route__v3__RouteList_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__RouteList_msg_init_ptr = &envoy__config__route__v3__RouteList_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_Route_submsgs[13] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_Route__submsgs[13] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteMatch_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RedirectAction_msg_init_ptr}, @@ -220,7 +220,7 @@ static const upb_MiniTableField envoy_config_route_v3_Route__fields[17] = { }; const upb_MiniTable envoy__config__route__v3__Route_msg_init = { - &envoy_config_route_v3_Route_submsgs[0], + &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 @@ -263,7 +263,7 @@ const upb_MiniTable envoy__config__route__v3__Route_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__Route_msg_init_ptr = &envoy__config__route__v3__Route_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_Route_TypedPerFilterConfigEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -273,7 +273,7 @@ static const upb_MiniTableField envoy_config_route_v3_Route_TypedPerFilterConfig }; const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init = { - &envoy_config_route_v3_Route_TypedPerFilterConfigEntry_submsgs[0], + &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 @@ -286,7 +286,7 @@ const upb_MiniTable envoy__config__route__v3__Route__TypedPerFilterConfigEntry_m }; const upb_MiniTable* envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__Route__TypedPerFilterConfigEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -299,7 +299,7 @@ static const upb_MiniTableField envoy_config_route_v3_WeightedCluster__fields[4] }; const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init = { - &envoy_config_route_v3_WeightedCluster_submsgs[0], + &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 @@ -318,7 +318,7 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__WeightedCluster_msg_init_ptr = &envoy__config__route__v3__WeightedCluster_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight__submsgs[5] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HeaderValueOption_msg_init_ptr}, @@ -340,7 +340,7 @@ static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWei }; const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init = { - &envoy_config_route_v3_WeightedCluster_ClusterWeight_submsgs[0], + &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 @@ -367,7 +367,7 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight_msg }; const upb_MiniTable* envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init_ptr = &envoy__config__route__v3__WeightedCluster__ClusterWeight_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -377,7 +377,7 @@ static const upb_MiniTableField envoy_config_route_v3_WeightedCluster_ClusterWei }; const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init = { - &envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_submsgs[0], + &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 @@ -390,7 +390,7 @@ const upb_MiniTable envoy__config__route__v3__WeightedCluster__ClusterWeight__Ty }; const upb_MiniTable* envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init_ptr = &envoy__config__route__v3__WeightedCluster__ClusterWeight__TypedPerFilterConfigEntry_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_ClusterSpecifierPlugin__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -400,7 +400,7 @@ static const upb_MiniTableField envoy_config_route_v3_ClusterSpecifierPlugin__fi }; const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init = { - &envoy_config_route_v3_ClusterSpecifierPlugin_submsgs[0], + &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 @@ -415,7 +415,7 @@ const upb_MiniTable envoy__config__route__v3__ClusterSpecifierPlugin_msg_init = }; const upb_MiniTable* envoy__config__route__v3__ClusterSpecifierPlugin_msg_init_ptr = &envoy__config__route__v3__ClusterSpecifierPlugin_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch_submsgs[10] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch__submsgs[10] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr}, @@ -445,7 +445,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteMatch__fields[13] = { }; const upb_MiniTable envoy__config__route__v3__RouteMatch_msg_init = { - &envoy_config_route_v3_RouteMatch_submsgs[0], + &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 @@ -482,7 +482,7 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_ }; const upb_MiniTable* envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init_ptr = &envoy__config__route__v3__RouteMatch__GrpcRouteMatchOptions_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteMatch_TlsContextMatchOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -493,7 +493,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteMatch_TlsContextMatch }; const upb_MiniTable envoy__config__route__v3__RouteMatch__TlsContextMatchOptions_msg_init = { - &envoy_config_route_v3_RouteMatch_TlsContextMatchOptions_submsgs[0], + &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 @@ -512,7 +512,7 @@ const upb_MiniTable envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_ini }; const upb_MiniTable* envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init_ptr = &envoy__config__route__v3__RouteMatch__ConnectMatcher_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_CorsPolicy_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_CorsPolicy__submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, @@ -535,7 +535,7 @@ static const upb_MiniTableField envoy_config_route_v3_CorsPolicy__fields[10] = { }; const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = { - &envoy_config_route_v3_CorsPolicy_submsgs[0], + &envoy_config_route_v3_CorsPolicy__submsgs[0], &envoy_config_route_v3_CorsPolicy__fields[0], UPB_SIZE(72, 128), 10, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -562,7 +562,7 @@ const upb_MiniTable envoy__config__route__v3__CorsPolicy_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__CorsPolicy_msg_init_ptr = &envoy__config__route__v3__CorsPolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_submsgs[24] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction__submsgs[24] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__WeightedCluster_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Metadata_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, @@ -627,7 +627,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction__fields[34] = }; const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init = { - &envoy_config_route_v3_RouteAction_submsgs[0], + &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 @@ -670,7 +670,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__RouteAction_msg_init_ptr = &envoy__config__route__v3__RouteAction_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_RequestMirrorPolicy_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_RequestMirrorPolicy__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -684,7 +684,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_RequestMirrorP }; 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__submsgs[0], &envoy_config_route_v3_RouteAction_RequestMirrorPolicy__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -703,7 +703,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__RequestMirrorPolicy_m }; const upb_MiniTable* envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init_ptr = &envoy__config__route__v3__RouteAction__RequestMirrorPolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__ConnectionProperties_msg_init_ptr}, @@ -721,7 +721,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy__fi }; 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__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 @@ -740,7 +740,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy_msg_init = }; const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Header__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr}, }; @@ -750,7 +750,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Hea }; const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Header_msg_init = { - &envoy_config_route_v3_RouteAction_HashPolicy_Header_submsgs[0], + &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 @@ -784,7 +784,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__CookieAtt }; const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_HashPolicy_Cookie__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__HashPolicy__CookieAttribute_msg_init_ptr}, }; @@ -797,7 +797,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_HashPolicy_Coo }; const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__Cookie_msg_init = { - &envoy_config_route_v3_RouteAction_HashPolicy_Cookie_submsgs[0], + &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 @@ -870,7 +870,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__HashPolicy__FilterSta }; const upb_MiniTable* envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init_ptr = &envoy__config__route__v3__RouteAction__HashPolicy__FilterState_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init_ptr}, }; @@ -882,7 +882,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig_ }; const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init = { - &envoy_config_route_v3_RouteAction_UpgradeConfig_submsgs[0], + &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 @@ -895,7 +895,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig_msg_ini }; const upb_MiniTable* envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init_ptr = &envoy__config__route__v3__RouteAction__UpgradeConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ProxyProtocolConfig_msg_init_ptr}, }; @@ -905,7 +905,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_UpgradeConfig_ }; const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init = { - &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[0], + &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 @@ -920,7 +920,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__UpgradeConfig__Connec }; const upb_MiniTable* envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init_ptr = &envoy__config__route__v3__RouteAction__UpgradeConfig__ConnectConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RouteAction_MaxStreamDuration__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -933,7 +933,7 @@ static const upb_MiniTableField envoy_config_route_v3_RouteAction_MaxStreamDurat }; const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init = { - &envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[0], + &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 @@ -942,7 +942,7 @@ const upb_MiniTable envoy__config__route__v3__RouteAction__MaxStreamDuration_msg }; const upb_MiniTable* envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init_ptr = &envoy__config__route__v3__RouteAction__MaxStreamDuration_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_submsgs[10] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy__submsgs[10] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init_ptr}, @@ -972,7 +972,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy__fields[13] = }; const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init = { - &envoy_config_route_v3_RetryPolicy_submsgs[0], + &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 @@ -999,7 +999,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__RetryPolicy_msg_init_ptr = &envoy__config__route__v3__RetryPolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryPriority__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -1009,7 +1009,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryPriority_ }; const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init = { - &envoy_config_route_v3_RetryPolicy_RetryPriority_submsgs[0], + &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 @@ -1024,7 +1024,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryPriority_msg_ini }; const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RetryPriority_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryHostPredicate__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -1034,7 +1034,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryHostPredi }; const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init = { - &envoy_config_route_v3_RetryPolicy_RetryHostPredicate_submsgs[0], + &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 @@ -1049,7 +1049,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RetryHostPredicate_ms }; const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RetryHostPredicate_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryBackOff_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RetryBackOff__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -1060,7 +1060,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RetryBackOff__ }; 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__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 @@ -1090,7 +1090,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init }; const upb_MiniTable* envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RetryPolicy__ResetHeader_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -1101,7 +1101,7 @@ static const upb_MiniTableField envoy_config_route_v3_RetryPolicy_RateLimitedRet }; const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init = { - &envoy_config_route_v3_RetryPolicy_RateLimitedRetryBackOff_submsgs[0], + &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 @@ -1114,7 +1114,7 @@ const upb_MiniTable envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackO }; const upb_MiniTable* envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init_ptr = &envoy__config__route__v3__RetryPolicy__RateLimitedRetryBackOff_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_HedgePolicy_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_HedgePolicy__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, }; @@ -1126,7 +1126,7 @@ static const upb_MiniTableField envoy_config_route_v3_HedgePolicy__fields[3] = { }; const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init = { - &envoy_config_route_v3_HedgePolicy_submsgs[0], + &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 @@ -1141,7 +1141,7 @@ const upb_MiniTable envoy__config__route__v3__HedgePolicy_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__HedgePolicy_msg_init_ptr = &envoy__config__route__v3__HedgePolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RedirectAction_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RedirectAction__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init_ptr}, }; @@ -1158,7 +1158,7 @@ static const upb_MiniTableField envoy_config_route_v3_RedirectAction__fields[9] }; const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init = { - &envoy_config_route_v3_RedirectAction_submsgs[0], + &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 @@ -1185,7 +1185,7 @@ const upb_MiniTable envoy__config__route__v3__RedirectAction_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__RedirectAction_msg_init_ptr = &envoy__config__route__v3__RedirectAction_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_DirectResponseAction_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_DirectResponseAction__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; @@ -1195,7 +1195,7 @@ static const upb_MiniTableField envoy_config_route_v3_DirectResponseAction__fiel }; const upb_MiniTable envoy__config__route__v3__DirectResponseAction_msg_init = { - &envoy_config_route_v3_DirectResponseAction_submsgs[0], + &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 @@ -1218,7 +1218,7 @@ const upb_MiniTable envoy__config__route__v3__NonForwardingAction_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__NonForwardingAction_msg_init_ptr = &envoy__config__route__v3__NonForwardingAction_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_Decorator_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_Decorator__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -1228,7 +1228,7 @@ static const upb_MiniTableField envoy_config_route_v3_Decorator__fields[2] = { }; const upb_MiniTable envoy__config__route__v3__Decorator_msg_init = { - &envoy_config_route_v3_Decorator_submsgs[0], + &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 @@ -1241,7 +1241,7 @@ const upb_MiniTable envoy__config__route__v3__Decorator_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__Decorator_msg_init_ptr = &envoy__config__route__v3__Decorator_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_Tracing_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_Tracing__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, @@ -1256,7 +1256,7 @@ static const upb_MiniTableField envoy_config_route_v3_Tracing__fields[4] = { }; const upb_MiniTable envoy__config__route__v3__Tracing_msg_init = { - &envoy_config_route_v3_Tracing_submsgs[0], + &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 @@ -1275,7 +1275,7 @@ const upb_MiniTable envoy__config__route__v3__Tracing_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__Tracing_msg_init_ptr = &envoy__config__route__v3__Tracing_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualCluster_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_VirtualCluster__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; @@ -1285,7 +1285,7 @@ static const upb_MiniTableField envoy_config_route_v3_VirtualCluster__fields[2] }; const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init = { - &envoy_config_route_v3_VirtualCluster_submsgs[0], + &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 @@ -1304,7 +1304,7 @@ const upb_MiniTable envoy__config__route__v3__VirtualCluster_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__VirtualCluster_msg_init_ptr = &envoy__config__route__v3__VirtualCluster_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Override_msg_init_ptr}, @@ -1318,7 +1318,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit__fields[4] = { }; const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init = { - &envoy_config_route_v3_RateLimit_submsgs[0], + &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 @@ -1333,7 +1333,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__RateLimit_msg_init_ptr = &envoy__config__route__v3__RateLimit_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_submsgs[11] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action__submsgs[11] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__SourceCluster_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__DestinationCluster_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Action__RequestHeaders_msg_init_ptr}, @@ -1362,7 +1362,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action__fields[1 }; 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__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 @@ -1441,7 +1441,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__RemoteAddress_m }; const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__RemoteAddress_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -1452,7 +1452,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MaskedRem }; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MaskedRemoteAddress_msg_init = { - &envoy_config_route_v3_RateLimit_Action_MaskedRemoteAddress_submsgs[0], + &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 @@ -1482,7 +1482,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__GenericKey_msg_ }; const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__GenericKey_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_HeaderValueMatch__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; @@ -1495,7 +1495,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_HeaderVal }; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init = { - &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_submsgs[0], + &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 @@ -1514,7 +1514,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__HeaderValueMatc }; const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__HeaderValueMatch_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_DynamicMetaData__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; @@ -1525,7 +1525,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_DynamicMe }; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init = { - &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_submsgs[0], + &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 @@ -1540,7 +1540,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__DynamicMetaData }; const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__DynamicMetaData_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_MetaData__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; @@ -1553,7 +1553,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_MetaData_ }; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_init = { - &envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[0], + &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 @@ -1572,7 +1572,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__MetaData_msg_in }; const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__MetaData_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__MetaData_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr}, }; @@ -1585,7 +1585,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Action_QueryPara }; const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init = { - &envoy_config_route_v3_RateLimit_Action_QueryParameterValueMatch_submsgs[0], + &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 @@ -1604,7 +1604,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Action__QueryParameterV }; const upb_MiniTable* envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init_ptr = &envoy__config__route__v3__RateLimit__Action__QueryParameterValueMatch_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init_ptr}, }; @@ -1613,7 +1613,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override__fields }; 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__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 @@ -1626,7 +1626,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__RateLimit__Override_msg_init_ptr = &envoy__config__route__v3__RateLimit__Override_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_RateLimit_Override_DynamicMetadata__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; @@ -1635,7 +1635,7 @@ static const upb_MiniTableField envoy_config_route_v3_RateLimit_Override_Dynamic }; const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init = { - &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_submsgs[0], + &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 @@ -1644,7 +1644,7 @@ const upb_MiniTable envoy__config__route__v3__RateLimit__Override__DynamicMetada }; const upb_MiniTable* envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init_ptr = &envoy__config__route__v3__RateLimit__Override__DynamicMetadata_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_HeaderMatcher_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_HeaderMatcher__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__Int64Range_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, @@ -1665,7 +1665,7 @@ static const upb_MiniTableField envoy_config_route_v3_HeaderMatcher__fields[11] }; const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init = { - &envoy_config_route_v3_HeaderMatcher_submsgs[0], + &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 @@ -1692,7 +1692,7 @@ const upb_MiniTable envoy__config__route__v3__HeaderMatcher_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__HeaderMatcher_msg_init_ptr = &envoy__config__route__v3__HeaderMatcher_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_QueryParameterMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_QueryParameterMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; @@ -1703,7 +1703,7 @@ static const upb_MiniTableField envoy_config_route_v3_QueryParameterMatcher__fie }; const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init = { - &envoy_config_route_v3_QueryParameterMatcher_submsgs[0], + &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 @@ -1722,7 +1722,7 @@ const upb_MiniTable envoy__config__route__v3__QueryParameterMatcher_msg_init = { }; const upb_MiniTable* envoy__config__route__v3__QueryParameterMatcher_msg_init_ptr = &envoy__config__route__v3__QueryParameterMatcher_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_InternalRedirectPolicy_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_InternalRedirectPolicy__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -1736,7 +1736,7 @@ static const upb_MiniTableField envoy_config_route_v3_InternalRedirectPolicy__fi }; const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init = { - &envoy_config_route_v3_InternalRedirectPolicy_submsgs[0], + &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 @@ -1755,7 +1755,7 @@ const upb_MiniTable envoy__config__route__v3__InternalRedirectPolicy_msg_init = }; const upb_MiniTable* envoy__config__route__v3__InternalRedirectPolicy_msg_init_ptr = &envoy__config__route__v3__InternalRedirectPolicy_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_FilterConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_FilterConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -1766,7 +1766,7 @@ static const upb_MiniTableField envoy_config_route_v3_FilterConfig__fields[3] = }; const upb_MiniTable envoy__config__route__v3__FilterConfig_msg_init = { - &envoy_config_route_v3_FilterConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h index 35331367f8..5a7c22a6fb 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/route_components.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -143,4 +143,4 @@ extern const upb_MiniTableFile envoy_config_route_v3_route_components_proto_upb_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 2378a9d697..b0a2a49a76 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_ -#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -357,4 +357,4 @@ UPB_INLINE void envoy_config_route_v3_ScopedRouteConfiguration_Key_Fragment_set_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_H_ */ 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 f0c3885812..e6e97d0fb8 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init_ptr}, }; @@ -33,7 +33,7 @@ static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration__ }; const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init = { - &envoy_config_route_v3_ScopedRouteConfiguration_submsgs[0], + &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 @@ -52,7 +52,7 @@ const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration_msg_init }; const upb_MiniTable* envoy__config__route__v3__ScopedRouteConfiguration_msg_init_ptr = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init; -static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_route_v3_ScopedRouteConfiguration_Key__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration__Key__Fragment_msg_init_ptr}, }; @@ -61,7 +61,7 @@ static const upb_MiniTableField envoy_config_route_v3_ScopedRouteConfiguration_K }; const upb_MiniTable envoy__config__route__v3__ScopedRouteConfiguration__Key_msg_init = { - &envoy_config_route_v3_ScopedRouteConfiguration_Key_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h index ab4ede108e..092df854c2 100644 --- a/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/route/v3/scoped_route.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_config_route_v3_scoped_route_proto_upb_file #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 570c4cf199..646207cfe0 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ -#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1649,4 +1649,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_tap_v3_Streamin #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_H_ */ 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 4b220d0743..4a87eeddb2 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 @@ -25,7 +25,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_tap_v3_TapConfig_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_TapConfig__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeFractionalPercent_msg_init_ptr}, @@ -40,7 +40,7 @@ static const upb_MiniTableField envoy_config_tap_v3_TapConfig__fields[4] = { }; const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = { - &envoy_config_tap_v3_TapConfig_submsgs[0], + &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 @@ -49,7 +49,7 @@ const upb_MiniTable envoy__config__tap__v3__TapConfig_msg_init = { }; const upb_MiniTable* envoy__config__tap__v3__TapConfig_msg_init_ptr = &envoy__config__tap__v3__TapConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_submsgs[9] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate__submsgs[9] = { {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr}, @@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate__fields[10] = }; const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = { - &envoy_config_tap_v3_MatchPredicate_submsgs[0], + &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 @@ -102,7 +102,7 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate_msg_init = { }; const upb_MiniTable* envoy__config__tap__v3__MatchPredicate_msg_init_ptr = &envoy__config__tap__v3__MatchPredicate_msg_init; -static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_MatchSet_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_MatchPredicate_MatchSet__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__MatchPredicate_msg_init_ptr}, }; @@ -111,7 +111,7 @@ static const upb_MiniTableField envoy_config_tap_v3_MatchPredicate_MatchSet__fie }; 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__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 @@ -124,7 +124,7 @@ const upb_MiniTable envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init = }; const upb_MiniTable* envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init_ptr = &envoy__config__tap__v3__MatchPredicate__MatchSet_msg_init; -static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpHeadersMatch_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpHeadersMatch__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, }; @@ -133,7 +133,7 @@ static const upb_MiniTableField envoy_config_tap_v3_HttpHeadersMatch__fields[1] }; const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = { - &envoy_config_tap_v3_HttpHeadersMatch_submsgs[0], + &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 @@ -146,7 +146,7 @@ const upb_MiniTable envoy__config__tap__v3__HttpHeadersMatch_msg_init = { }; const upb_MiniTable* envoy__config__tap__v3__HttpHeadersMatch_msg_init_ptr = &envoy__config__tap__v3__HttpHeadersMatch_msg_init; -static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_HttpGenericBodyMatch__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr}, }; @@ -156,7 +156,7 @@ static const upb_MiniTableField envoy_config_tap_v3_HttpGenericBodyMatch__fields }; const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch_msg_init = { - &envoy_config_tap_v3_HttpGenericBodyMatch_submsgs[0], + &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 @@ -192,7 +192,7 @@ const upb_MiniTable envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMat }; const upb_MiniTable* envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init_ptr = &envoy__config__tap__v3__HttpGenericBodyMatch__GenericTextMatch_msg_init; -static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__OutputSink_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -206,7 +206,7 @@ static const upb_MiniTableField envoy_config_tap_v3_OutputConfig__fields[4] = { }; const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = { - &envoy_config_tap_v3_OutputConfig_submsgs[0], + &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 @@ -225,7 +225,7 @@ const upb_MiniTable envoy__config__tap__v3__OutputConfig_msg_init = { }; const upb_MiniTable* envoy__config__tap__v3__OutputConfig_msg_init_ptr = &envoy__config__tap__v3__OutputConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputSink_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_OutputSink__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__FilePerTapSink_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__tap__v3__StreamingGrpcSink_msg_init_ptr}, @@ -243,7 +243,7 @@ static const upb_MiniTableField envoy_config_tap_v3_OutputSink__fields[6] = { }; const upb_MiniTable envoy__config__tap__v3__OutputSink_msg_init = { - &envoy_config_tap_v3_OutputSink_submsgs[0], + &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 @@ -272,7 +272,7 @@ const upb_MiniTable envoy__config__tap__v3__StreamingAdminSink_msg_init = { }; const upb_MiniTable* envoy__config__tap__v3__StreamingAdminSink_msg_init_ptr = &envoy__config__tap__v3__StreamingAdminSink_msg_init; -static const upb_MiniTableSubInternal envoy_config_tap_v3_BufferedAdminSink_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_BufferedAdminSink__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -282,7 +282,7 @@ static const upb_MiniTableField envoy_config_tap_v3_BufferedAdminSink__fields[2] }; const upb_MiniTable envoy__config__tap__v3__BufferedAdminSink_msg_init = { - &envoy_config_tap_v3_BufferedAdminSink_submsgs[0], + &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 @@ -313,7 +313,7 @@ const upb_MiniTable envoy__config__tap__v3__FilePerTapSink_msg_init = { }; const upb_MiniTable* envoy__config__tap__v3__FilePerTapSink_msg_init_ptr = &envoy__config__tap__v3__FilePerTapSink_msg_init; -static const upb_MiniTableSubInternal envoy_config_tap_v3_StreamingGrpcSink_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_tap_v3_StreamingGrpcSink__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, }; @@ -323,7 +323,7 @@ static const upb_MiniTableField envoy_config_tap_v3_StreamingGrpcSink__fields[2] }; const upb_MiniTable envoy__config__tap__v3__StreamingGrpcSink_msg_init = { - &envoy_config_tap_v3_StreamingGrpcSink_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h index 27bd5683c2..fbf2b413f5 100644 --- a/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/tap/v3/common.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -51,4 +51,4 @@ extern const upb_MiniTableFile envoy_config_tap_v3_common_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 a3ef65b3f2..f541eadaea 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -222,4 +222,4 @@ UPB_INLINE struct envoy_config_trace_v3_DatadogRemoteConfig* envoy_config_trace_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_H_ */ 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 0d7512e8fc..c9e439a672 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogRemoteConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogRemoteConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DatadogRemoteConfig__field }; const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = { - &envoy_config_trace_v3_DatadogRemoteConfig_submsgs[0], + &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 @@ -37,7 +37,7 @@ const upb_MiniTable envoy__config__trace__v3__DatadogRemoteConfig_msg_init = { }; const upb_MiniTable* envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_DatadogConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__DatadogRemoteConfig_msg_init_ptr}, }; @@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DatadogConfig__fields[4] = }; const upb_MiniTable envoy__config__trace__v3__DatadogConfig_msg_init = { - &envoy_config_trace_v3_DatadogConfig_submsgs[0], + &envoy_config_trace_v3_DatadogConfig__submsgs[0], &envoy_config_trace_v3_DatadogConfig__fields[0], UPB_SIZE(40, 72), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED 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 d7d096c7f9..cddf338a8f 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_datadog_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 23124ea5a3..bfbb040484 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -122,4 +122,4 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_DynamicOtConfig_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_H_ */ 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 d05f6993b5..8477f3baf9 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_DynamicOtConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_DynamicOtConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; @@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_config_trace_v3_DynamicOtConfig__fields[2] }; const upb_MiniTable envoy__config__trace__v3__DynamicOtConfig_msg_init = { - &envoy_config_trace_v3_DynamicOtConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h index 3b8b0edf53..3789285f69 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/dynamic_ot.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_dynamic_ot_proto_upb_file_l #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 a3a19e96a2..1d45543fb2 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -198,4 +198,4 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_trace_v3_Tracing_Http_mutabl #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_H_ */ 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 b7e3acdf71..d091ace910 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__Tracing__Http_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_trace_v3_Tracing__fields[1] = { }; const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = { - &envoy_config_trace_v3_Tracing_submsgs[0], + &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 @@ -36,7 +36,7 @@ const upb_MiniTable envoy__config__trace__v3__Tracing_msg_init = { }; const upb_MiniTable* envoy__config__trace__v3__Tracing_msg_init_ptr = &envoy__config__trace__v3__Tracing_msg_init; -static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_Http_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_Tracing_Http__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -46,7 +46,7 @@ static const upb_MiniTableField envoy_config_trace_v3_Tracing_Http__fields[2] = }; 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__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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h index 3a73ca85b2..bdc7ff343f 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/http_tracer.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_http_tracer_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 40ed544864..e209d7d84e 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -205,4 +205,4 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_trace_v3_Lightst #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_H_ */ 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 32d753f641..272ef77056 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_LightstepConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_LightstepConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; @@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_config_trace_v3_LightstepConfig__fields[4] }; const upb_MiniTable envoy__config__trace__v3__LightstepConfig_msg_init = { - &envoy_config_trace_v3_LightstepConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h index 1ba326dce4..e706a3ff94 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/lightstep.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_lightstep_proto_upb_file_la #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 6e5b919ff1..8242b6bc47 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -423,4 +423,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_OpenCe #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_H_ */ 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 591498a04a..70612cf42a 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenCensusConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenCensusConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__TraceConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, @@ -43,7 +43,7 @@ static const upb_MiniTableField envoy_config_trace_v3_OpenCensusConfig__fields[1 }; const upb_MiniTable envoy__config__trace__v3__OpenCensusConfig_msg_init = { - &envoy_config_trace_v3_OpenCensusConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h index a50ace9f60..7625c551b5 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opencensus.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_opencensus_proto_upb_file_l #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 dfe7668e2a..d460acc894 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -250,4 +250,4 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_trace_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_H_ */ 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 881108402f..18acc29777 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenTelemetryConfig_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_OpenTelemetryConfig__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpService_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, @@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_trace_v3_OpenTelemetryConfig__field }; const upb_MiniTable envoy__config__trace__v3__OpenTelemetryConfig_msg_init = { - &envoy_config_trace_v3_OpenTelemetryConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h index 76c4b4e13e..413f066bfd 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/opentelemetry.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_opentelemetry_proto_upb_fil #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c82e4f2620..0e31775f60 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -104,4 +104,4 @@ UPB_INLINE struct envoy_config_core_v3_GrpcService* envoy_config_trace_v3_TraceS #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_H_ */ 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 33bfcf34a4..39f693bd06 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_TraceServiceConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_TraceServiceConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_config_trace_v3_TraceServiceConfig__fields }; const upb_MiniTable envoy__config__trace__v3__TraceServiceConfig_msg_init = { - &envoy_config_trace_v3_TraceServiceConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h index 2a03b64e0c..28e27f068d 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/service.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_service_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 a0faa7cf2c..a06fb59162 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -267,4 +267,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_trace_v3_ClientConfi #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_H_ */ 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 204599f193..0075c7bf0c 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_SkyWalkingConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_SkyWalkingConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__GrpcService_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__ClientConfig_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_config_trace_v3_SkyWalkingConfig__fields[2 }; const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init = { - &envoy_config_trace_v3_SkyWalkingConfig_submsgs[0], + &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 @@ -40,7 +40,7 @@ const upb_MiniTable envoy__config__trace__v3__SkyWalkingConfig_msg_init = { }; const upb_MiniTable* envoy__config__trace__v3__SkyWalkingConfig_msg_init_ptr = &envoy__config__trace__v3__SkyWalkingConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_trace_v3_ClientConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_ClientConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -52,7 +52,7 @@ static const upb_MiniTableField envoy_config_trace_v3_ClientConfig__fields[4] = }; const upb_MiniTable envoy__config__trace__v3__ClientConfig_msg_init = { - &envoy_config_trace_v3_ClientConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h index 9c8b5dec06..a4ef4dc4d9 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/skywalking.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_skywalking_proto_upb_file_l #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h index 3eb50b671d..f7c91f83d9 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -47,4 +47,4 @@ extern "C" { #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h index 5975b4104d..7f1750ed03 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/trace.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" /* Public Imports. */ @@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_trace_proto_upb_file_layout #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c49be10959..cb8d7076b0 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -270,4 +270,4 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_trace_v3_XRayConfig_Segme #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_H_ */ 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 7e7e00e2a8..c64e879841 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 @@ -21,7 +21,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SocketAddress_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__trace__v3__XRayConfig__SegmentFields_msg_init_ptr}, @@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_trace_v3_XRayConfig__fields[4] = { }; const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init = { - &envoy_config_trace_v3_XRayConfig_submsgs[0], + &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 @@ -50,7 +50,7 @@ const upb_MiniTable envoy__config__trace__v3__XRayConfig_msg_init = { }; const upb_MiniTable* envoy__config__trace__v3__XRayConfig_msg_init_ptr = &envoy__config__trace__v3__XRayConfig_msg_init; -static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig_SegmentFields_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_XRayConfig_SegmentFields__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; @@ -60,7 +60,7 @@ static const upb_MiniTableField envoy_config_trace_v3_XRayConfig_SegmentFields__ }; 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__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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h index 50d82879ae..029024b15a 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/xray.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_xray_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c3bd9434a8..99e0cbc076 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_ -#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_H_ +#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -209,4 +209,4 @@ UPB_INLINE void envoy_config_trace_v3_ZipkinConfig_set_split_spans_for_request(e #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_H_ */ 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 24f29ffec7..512b9a1e2a 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_config_trace_v3_ZipkinConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_config_trace_v3_ZipkinConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_config_trace_v3_ZipkinConfig__fields[7] = }; const upb_MiniTable envoy__config__trace__v3__ZipkinConfig_msg_init = { - &envoy_config_trace_v3_ZipkinConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h index 2e207c74a9..df4491dd6c 100644 --- a/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/config/trace/v3/zipkin.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_ -#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_config_trace_v3_zipkin_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 21ea86b140..d010d80ea5 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ -#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ +#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ +#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -2974,4 +2974,4 @@ UPB_INLINE void envoy_data_accesslog_v3_HTTPResponseProperties_ResponseTrailersE #include "upb/port/undef.inc" -#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H_ */ +#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_H_ */ 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 2ba6173bf4..b98b013043 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 @@ -24,7 +24,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TCPAccessLogEntry__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ConnectionProperties_msg_init_ptr}, }; @@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_TCPAccessLogEntry__field }; const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init = { - &envoy_data_accesslog_v3_TCPAccessLogEntry_submsgs[0], + &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 @@ -44,7 +44,7 @@ const upb_MiniTable envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init = { }; const upb_MiniTable* envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init_ptr = &envoy__data__accesslog__v3__TCPAccessLogEntry_msg_init; -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPAccessLogEntry__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPRequestProperties_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties_msg_init_ptr}, @@ -58,7 +58,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_HTTPAccessLogEntry__fiel }; const upb_MiniTable envoy__data__accesslog__v3__HTTPAccessLogEntry_msg_init = { - &envoy_data_accesslog_v3_HTTPAccessLogEntry_submsgs[0], + &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 @@ -94,7 +94,7 @@ const upb_MiniTable envoy__data__accesslog__v3__ConnectionProperties_msg_init = }; const upb_MiniTable* envoy__data__accesslog__v3__ConnectionProperties_msg_init_ptr = &envoy__data__accesslog__v3__ConnectionProperties_msg_init; -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon_submsgs[19] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon__submsgs[19] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Address_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties_msg_init_ptr}, @@ -153,7 +153,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon__fields[ }; const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init = { - &envoy_data_accesslog_v3_AccessLogCommon_submsgs[0], + &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 @@ -196,7 +196,7 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon_msg_init = { }; const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon_msg_init_ptr = &envoy__data__accesslog__v3__AccessLogCommon_msg_init; -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -206,7 +206,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_AccessLogCommon_FilterSt }; const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__FilterStateObjectsEntry_msg_init = { - &envoy_data_accesslog_v3_AccessLogCommon_FilterStateObjectsEntry_submsgs[0], + &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 @@ -240,7 +240,7 @@ const upb_MiniTable envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry }; const upb_MiniTable* envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init_ptr = &envoy__data__accesslog__v3__AccessLogCommon__CustomTagsEntry_msg_init; -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_ResponseFlags_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_ResponseFlags__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init_ptr}, }; @@ -276,7 +276,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_ResponseFlags__fields[28 }; const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags_msg_init = { - &envoy_data_accesslog_v3_ResponseFlags_submsgs[0], + &envoy_data_accesslog_v3_ResponseFlags__submsgs[0], &envoy_data_accesslog_v3_ResponseFlags__fields[0], 48, 28, kUpb_ExtMode_NonExtendable, 28, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -337,7 +337,7 @@ const upb_MiniTable envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_ }; const upb_MiniTable* envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init_ptr = &envoy__data__accesslog__v3__ResponseFlags__Unauthorized_msg_init; -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init_ptr}, @@ -354,7 +354,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties__fields[7] }; const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init = { - &envoy_data_accesslog_v3_TLSProperties_submsgs[0], + &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 @@ -373,7 +373,7 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties_msg_init = { }; const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties_msg_init_ptr = &envoy__data__accesslog__v3__TLSProperties_msg_init; -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_TLSProperties_CertificateProperties__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init_ptr}, }; @@ -384,7 +384,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_TLSProperties_Certificat }; const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProperties_msg_init = { - &envoy_data_accesslog_v3_TLSProperties_CertificateProperties_submsgs[0], + &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 @@ -420,7 +420,7 @@ const upb_MiniTable envoy__data__accesslog__v3__TLSProperties__CertificateProper }; const upb_MiniTable* envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init_ptr = &envoy__data__accesslog__v3__TLSProperties__CertificateProperties__SubjectAltName_msg_init; -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPRequestProperties__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init_ptr}, }; @@ -444,7 +444,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_HTTPRequestProperties__f }; const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties_msg_init = { - &envoy_data_accesslog_v3_HTTPRequestProperties_submsgs[0], + &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 @@ -492,7 +492,7 @@ const upb_MiniTable envoy__data__accesslog__v3__HTTPRequestProperties__RequestHe }; const upb_MiniTable* envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init_ptr = &envoy__data__accesslog__v3__HTTPRequestProperties__RequestHeadersEntry_msg_init; -static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_data_accesslog_v3_HTTPResponseProperties__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseHeadersEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__data__accesslog__v3__HTTPResponseProperties__ResponseTrailersEntry_msg_init_ptr}, @@ -510,7 +510,7 @@ static const upb_MiniTableField envoy_data_accesslog_v3_HTTPResponseProperties__ }; const upb_MiniTable envoy__data__accesslog__v3__HTTPResponseProperties_msg_init = { - &envoy_data_accesslog_v3_HTTPResponseProperties_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h index ffce3d3358..72f952e2a5 100644 --- a/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/data/accesslog/v3/accesslog.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -59,4 +59,4 @@ extern const upb_MiniTableFile envoy_data_accesslog_v3_accesslog_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h index 8c6ebbe6a4..758f9b2dd7 100644 --- a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -132,4 +132,4 @@ UPB_INLINE bool envoy_extensions_clusters_aggregate_v3_ClusterConfig_add_cluster #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h index 266c0efb76..30bbabd7a1 100644 --- a/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/clusters/aggregate/v3/cluster.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_clusters_aggregate_v3_cluster_pr #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 48a4be6ca6..792724211e 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -452,4 +452,4 @@ UPB_INLINE char* envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderL #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_ */ 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 7e53431d5d..edf7467ec9 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultDelay__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init_ptr}, @@ -32,7 +32,7 @@ static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultDe }; const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init = { - &envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[0], + &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 @@ -61,7 +61,7 @@ const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultDelay__H }; const upb_MiniTable* envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init_ptr = &envoy__extensions__filters__common__fault__v3__FaultDelay__HeaderDelay_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_common_fault_v3_FaultRateLimit__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__FixedLimit_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultRateLimit__HeaderLimit_msg_init_ptr}, @@ -74,7 +74,7 @@ static const upb_MiniTableField envoy_extensions_filters_common_fault_v3_FaultRa }; const upb_MiniTable envoy__extensions__filters__common__fault__v3__FaultRateLimit_msg_init = { - &envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h index f5047f1468..df8d621bd6 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/common/fault/v3/fault.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_common_fault_v3_fault_pr #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 5d02885458..f7be77edc0 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -693,4 +693,4 @@ UPB_INLINE struct google_protobuf_Struct* envoy_extensions_filters_http_fault_v3 #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_H_ */ 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 707992af70..8ed7c04f09 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 @@ -22,7 +22,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_FaultAbort__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__FractionalPercent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init_ptr}, }; @@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_FaultAbor }; const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init = { - &envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[0], + &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 @@ -64,7 +64,7 @@ const upb_MiniTable envoy__extensions__filters__http__fault__v3__FaultAbort__Hea }; const upb_MiniTable* envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init_ptr = &envoy__extensions__filters__http__fault__v3__FaultAbort__HeaderAbort_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_fault_v3_HTTPFault__submsgs[6] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__common__fault__v3__FaultDelay_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__fault__v3__FaultAbort_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__HeaderMatcher_msg_init_ptr}, @@ -93,7 +93,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_fault_v3_HTTPFault }; const upb_MiniTable envoy__extensions__filters__http__fault__v3__HTTPFault_msg_init = { - &envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h index c027169292..fe37dae4ac 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/fault/v3/fault.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_fault_v3_fault_prot #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h index 5f22ea41ce..f207651cb8 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -441,4 +441,4 @@ UPB_INLINE void envoy_extensions_filters_http_gcp_authn_v3_TokenHeader_set_value #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c index 546ac22ac0..5a8472bf78 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.c @@ -21,7 +21,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpUri_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RetryPolicy_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init_ptr}, @@ -39,7 +39,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_GcpAu }; const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__GcpAuthnFilterConfig_msg_init = { - &envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_submsgs[0], + &envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__submsgs[0], &envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig__fields[0], UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -76,7 +76,7 @@ const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__Audience_m }; const upb_MiniTable* envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init_ptr = &envoy__extensions__filters__http__gcp_0authn__v3__Audience_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; @@ -85,7 +85,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_gcp_authn_v3_Token }; const upb_MiniTable envoy__extensions__filters__http__gcp_0authn__v3__TokenCacheConfig_msg_init = { - &envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig_submsgs[0], + &envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__submsgs[0], &envoy_extensions_filters_http_gcp_authn_v3_TokenCacheConfig__fields[0], UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h index e0837c746f..f357da0e81 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_gcp_authn_v3_gcp_au #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 fc3bfd9f9f..7c84475a8a 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -314,4 +314,4 @@ UPB_INLINE struct envoy_extensions_filters_http_rbac_v3_RBAC* envoy_extensions_f #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_H_ */ 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 b01ac992b4..3c15187714 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBAC_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBAC__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__rbac__v3__RBAC_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr}, @@ -38,7 +38,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBAC__fiel }; 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__submsgs[0], &envoy_extensions_filters_http_rbac_v3_RBAC__fields[0], UPB_SIZE(48, 80), 7, kUpb_ExtMode_NonExtendable, 7, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -57,7 +57,7 @@ const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBAC_msg_init = }; const upb_MiniTable* envoy__extensions__filters__http__rbac__v3__RBAC_msg_init_ptr = &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_rbac_v3_RBACPerRoute__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__rbac__v3__RBAC_msg_init_ptr}, }; @@ -66,7 +66,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_rbac_v3_RBACPerRou }; const upb_MiniTable envoy__extensions__filters__http__rbac__v3__RBACPerRoute_msg_init = { - &envoy_extensions_filters_http_rbac_v3_RBACPerRoute_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h index 242b192bd9..cdb0423a3f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/rbac/v3/rbac.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_rbac_v3_rbac_proto_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 de9b482468..de55581364 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -484,4 +484,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_http_router #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_H_ */ 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 c0351cb47f..4793bf8c5d 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 @@ -22,7 +22,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLog_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr}, @@ -42,7 +42,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router__ }; const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_init = { - &envoy_extensions_filters_http_router_v3_Router_submsgs[0], + &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 @@ -69,7 +69,7 @@ const upb_MiniTable envoy__extensions__filters__http__router__v3__Router_msg_ini }; const upb_MiniTable* envoy__extensions__filters__http__router__v3__Router_msg_init_ptr = &envoy__extensions__filters__http__router__v3__Router_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -79,7 +79,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_router_v3_Router_U }; const upb_MiniTable envoy__extensions__filters__http__router__v3__Router__UpstreamAccessLogOptions_msg_init = { - &envoy_extensions_filters_http_router_v3_Router_UpstreamAccessLogOptions_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h index a2a86c4685..b5e4bf1e96 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/router/v3/router.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_router_v3_router_pr #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 e8e9dd1916..66bbb51267 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -218,4 +218,4 @@ UPB_INLINE struct envoy_extensions_filters_http_stateful_session_v3_StatefulSess #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_H_ */ 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 5f080e14a9..3dc7355742 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSession__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v }; const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init = { - &envoy_extensions_filters_http_stateful_session_v3_StatefulSession_submsgs[0], + &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 @@ -42,7 +42,7 @@ const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__Sta }; const upb_MiniTable* envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init_ptr = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__http__stateful_0session__v3__StatefulSession_msg_init_ptr}, }; @@ -52,7 +52,7 @@ static const upb_MiniTableField envoy_extensions_filters_http_stateful_session_v }; const upb_MiniTable envoy__extensions__filters__http__stateful_0session__v3__StatefulSessionPerRoute_msg_init = { - &envoy_extensions_filters_http_stateful_session_v3_StatefulSessionPerRoute_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h index 93e101e8fb..a0538f5977 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_http_stateful_session_v3 #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 bd62a0fdeb..50fb380deb 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -4294,4 +4294,4 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Ht #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_H_ */ 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 af00227b2e..65145acee5 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 @@ -36,7 +36,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[35] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__submsgs[35] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__RouteConfiguration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr}, @@ -133,7 +133,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; 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__submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[0], UPB_SIZE(240, 384), 55, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -176,7 +176,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[7] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing__submsgs[7] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, @@ -198,7 +198,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[0], + &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 @@ -225,7 +225,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__Tracing_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, }; @@ -235,7 +235,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_InternalAddressConfig_submsgs[0], + &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 @@ -250,7 +250,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__InternalAddressConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -263,7 +263,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_SetCurrentClientCertDetails_submsgs[0], + &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 @@ -282,7 +282,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__SetCurrentClientCertDetails_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, }; @@ -294,7 +294,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_submsgs[0], + &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 @@ -309,7 +309,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__UpgradeConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation_msg_init_ptr}, }; @@ -320,7 +320,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__PathNormalizationOptions_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathNormalizationOptions_submsgs[0], + &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 @@ -358,7 +358,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__ProxyStatusConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -369,7 +369,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions_submsgs[0], + &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 @@ -384,7 +384,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager__HcmAccessLogOptions_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__SubstitutionFormatString_msg_init_ptr}, }; @@ -395,7 +395,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_LocalReplyConfig_submsgs[0], + &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 @@ -408,7 +408,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__LocalReplyConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__accesslog__v3__AccessLogFilter_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, @@ -425,7 +425,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_ResponseMapper_submsgs[0], + &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 @@ -444,7 +444,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ResponseMapper_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_Rds__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; @@ -454,7 +454,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[0], + &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 @@ -469,7 +469,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__Rds_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__route__v3__ScopedRouteConfiguration_msg_init_ptr}, }; @@ -478,7 +478,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[0], + &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 @@ -491,7 +491,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRouteConfigurationsList_msg_init_ptr}, @@ -507,7 +507,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_submsgs[0], + &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 @@ -526,7 +526,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init_ptr}, }; @@ -535,7 +535,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_submsgs[0], + &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 @@ -548,7 +548,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init_ptr}, }; @@ -557,7 +557,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_submsgs[0], + &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 @@ -570,7 +570,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes_ScopeKeyBuilder_FragmentBuilder_HeaderValueExtractor__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init_ptr}, }; @@ -582,7 +582,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor_msg_init = { - &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__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 @@ -622,7 +622,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRoutes__ScopeKeyBuilder__FragmentBuilder__HeaderValueExtractor__KvElement_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; @@ -632,7 +632,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_ScopedRds_submsgs[0], + &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 @@ -647,7 +647,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__ScopedRds_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ExtensionConfigSource_msg_init_ptr}, }; @@ -661,7 +661,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[0], + &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 @@ -680,7 +680,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpFilter_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -689,7 +689,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[0], + &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 @@ -698,7 +698,7 @@ const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manag }; const upb_MiniTable* envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init_ptr = &envoy__extensions__filters__network__http_0connection_0manager__v3__RequestIDExtension_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__filters__network__http_0connection_0manager__v3__HttpConnectionManager_msg_init_ptr}, }; @@ -707,7 +707,7 @@ static const upb_MiniTableField envoy_extensions_filters_network_http_connection }; const upb_MiniTable envoy__extensions__filters__network__http_0connection_0manager__v3__EnvoyMobileHttpConnectionManager_msg_init = { - &envoy_extensions_filters_network_http_connection_manager_v3_EnvoyMobileHttpConnectionManager_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h index 9ab23a7a75..5a10530c5b 100644 --- a/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -69,4 +69,4 @@ extern const upb_MiniTableFile envoy_extensions_filters_network_http_connection_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 52cb6c0206..fcad83aba5 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -103,4 +103,4 @@ UPB_INLINE struct envoy_type_http_v3_Cookie* envoy_extensions_http_stateful_sess #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_H_ */ 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 1b86f49d99..cbde1caedc 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__Cookie_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_extensions_http_stateful_session_cookie_v3 }; const upb_MiniTable envoy__extensions__http__stateful_0session__cookie__v3__CookieBasedSessionState_msg_init = { - &envoy_extensions_http_stateful_session_cookie_v3_CookieBasedSessionState_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h index bd205f1009..31216935a4 100644 --- a/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_http_stateful_session_cookie_v3_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 53d3088335..7bf9903bec 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -256,4 +256,4 @@ UPB_INLINE struct google_protobuf_FloatValue* envoy_extensions_load_balancing_po #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_H_ */ 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 09683a4aec..56aaaaf6ad 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_submsgs[6] = { +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin__submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -37,7 +37,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_client_ }; const upb_MiniTable envoy__extensions__load_0balancing_0policies__client_0side_0weighted_0round_0robin__v3__ClientSideWeightedRoundRobin_msg_init = { - &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__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 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.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h index ea08acd393..39b1b2f290 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.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_client_s #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_V3_CLIENT_SIDE_WEIGHTED_ROUND_ROBIN_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 791b6f0ce4..d8adb22bb9 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -518,4 +518,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_load_balancing_p #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_H_ */ 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 2673eae423..a10bfbc617 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 @@ -20,7 +20,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_ }; const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init = { - &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_submsgs[0], + &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 @@ -46,7 +46,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo }; const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, }; @@ -58,7 +58,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_ }; const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__ZoneAwareLbConfig_msg_init = { - &envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_ZoneAwareLbConfig_submsgs[0], + &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 @@ -83,7 +83,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Lo }; const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__LocalityLbConfig__LocalityWeightedLbConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__RuntimeDouble_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__Percent_msg_init_ptr}, @@ -96,7 +96,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_ }; const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init = { - &envoy_extensions_load_balancing_policies_common_v3_SlowStartConfig_submsgs[0], + &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 @@ -105,7 +105,7 @@ const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__Sl }; const upb_MiniTable* envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init_ptr = &envoy__extensions__load_0balancing_0policies__common__v3__SlowStartConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -115,7 +115,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_common_ }; const upb_MiniTable envoy__extensions__load_0balancing_0policies__common__v3__ConsistentHashingLbConfig_msg_init = { - &envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h index 4625747e38..653b56e008 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/common/v3/common.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_common_v #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_COMMON_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 74da76be89..624349552f 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -86,4 +86,4 @@ UPB_INLINE void envoy_extensions_load_balancing_policies_pick_first_v3_PickFirst #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h index c3af38b4a9..23dfe1c43e 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_pick_fir #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_PICK_FIRST_V3_PICK_FIRST_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 2ce386991b..6f35afd51b 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -266,4 +266,4 @@ UPB_INLINE struct envoy_extensions_load_balancing_policies_common_v3_LocalityLbC #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_H_ */ 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 c9e4ef6631..f1b5118715 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash__submsgs[5] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt64Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, @@ -38,7 +38,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_ring_ha }; const upb_MiniTable envoy__extensions__load_0balancing_0policies__ring_0hash__v3__RingHash_msg_init = { - &envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h index b900eeddec..b87050409c 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_ring_has #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_RING_HASH_V3_RING_HASH_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 e765134f4d..0f15b59ce5 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -103,4 +103,4 @@ UPB_INLINE struct envoy_config_cluster_v3_LoadBalancingPolicy* envoy_extensions_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_H_ */ 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 48ded81232..2d9d2e4278 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__cluster__v3__LoadBalancingPolicy_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_extensions_load_balancing_policies_wrr_loc }; const upb_MiniTable envoy__extensions__load_0balancing_0policies__wrr_0locality__v3__WrrLocality_msg_init = { - &envoy_extensions_load_balancing_policies_wrr_locality_v3_WrrLocality_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h index b0e444089b..837143920a 100644 --- a/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_extensions_load_balancing_policies_wrr_loca #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_LOAD_BALANCING_POLICIES_WRR_LOCALITY_V3_WRR_LOCALITY_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h new file mode 100644 index 0000000000..8d631b2e9d --- /dev/null +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h @@ -0,0 +1,106 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ + +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_H_ + +#include "upb/generated_code_support.h" + +#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h" + +#include "envoy/config/core/v3/base.upb_minitable.h" +#include "udpa/annotations/status.upb_minitable.h" +#include "validate/validate.upb_minitable.h" + +// Must be last. +#include "upb/port/def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport; +struct envoy_config_core_v3_TransportSocket; + + + +/* envoy.extensions.transport_sockets.http_11_proxy.v3.Http11ProxyUpstreamTransport */ + +UPB_INLINE envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_new(upb_Arena* arena) { + return (envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport*)_upb_Message_New(&envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, arena); +} +UPB_INLINE envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_parse(const char* buf, size_t size, upb_Arena* arena) { + envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* ret = envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, NULL, 0, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* ret = envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, extreg, options, + arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_serialize(const envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg, upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, 0, arena, &ptr, len); + return ptr; +} +UPB_INLINE char* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_serialize_ex(const envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg, int options, + upb_Arena* arena, size_t* len) { + char* ptr; + (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, options, arena, &ptr, len); + return ptr; +} +UPB_INLINE void envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_clear_transport_socket(envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* 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 envoy_config_core_v3_TransportSocket* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_transport_socket(const envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg) { + const struct envoy_config_core_v3_TransportSocket* default_val = NULL; + const struct envoy_config_core_v3_TransportSocket* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init); + _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field, + &default_val, &ret); + return ret; +} +UPB_INLINE bool envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_has_transport_socket(const envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* 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_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_set_transport_socket(envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport *msg, struct envoy_config_core_v3_TransportSocket* 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_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init); + upb_Message_SetBaseField((upb_Message *)msg, &field, &value); +} +UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_mutable_transport_socket(envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg, upb_Arena* arena) { + struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_transport_socket(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_TransportSocket*)_upb_Message_New(&envoy__config__core__v3__TransportSocket_msg_init, arena); + if (sub) envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_set_transport_socket(msg, sub); + } + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" + +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c new file mode 100644 index 0000000000..8ddc697d41 --- /dev/null +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c @@ -0,0 +1,52 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ + +#include +#include "upb/generated_code_support.h" +#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h" +#include "envoy/config/core/v3/base.upb_minitable.h" +#include "udpa/annotations/status.upb_minitable.h" +#include "validate/validate.upb_minitable.h" + +// Must be last. +#include "upb/port/def.inc" + +extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__submsgs[1] = { + {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init_ptr}, +}; + +static const upb_MiniTableField envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__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__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init = { + &envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__submsgs[0], + &envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__fields[0], + UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0, +#ifdef UPB_TRACING_ENABLED + "envoy.extensions.transport_sockets.http_11_proxy.v3.Http11ProxyUpstreamTransport", +#endif +}; + +const upb_MiniTable* envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init_ptr = &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init; +static const upb_MiniTable *messages_layout[1] = { + &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, +}; + +const upb_MiniTableFile envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upb_file_layout = { + messages_layout, + NULL, + NULL, + 1, + 0, + 0, +}; + +#include "upb/port/undef.inc" + diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h new file mode 100644 index 0000000000..2542d99563 --- /dev/null +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h @@ -0,0 +1,32 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ + +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_MINITABLE_H_ + +#include "upb/generated_code_support.h" + +// Must be last. +#include "upb/port/def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +extern const upb_MiniTable envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init; +extern const upb_MiniTable* envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init_ptr; + +extern const upb_MiniTableFile envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upb_file_layout; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" + +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h index d4ddd65a37..068186255f 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -37,4 +37,4 @@ extern "C" { #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h index 1a0c8be676..20d515eb10 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" /* Public Imports. */ @@ -32,4 +32,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_cert_pr #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 a90abb9e57..394f64ada7 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1645,4 +1645,4 @@ UPB_INLINE char* envoy_extensions_transport_sockets_tls_v3_CertificateValidation #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_H_ */ 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 a5b3b63750..5fc282ec76 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 @@ -53,7 +53,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsParameter }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -64,7 +64,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Privat }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_submsgs[0], + &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 @@ -83,7 +83,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__PrivateKeyPr }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__PrivateKeyProvider_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[8] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsCertificate__submsgs[8] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, @@ -106,7 +106,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsCer }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[0], + &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 @@ -125,7 +125,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsCertifica }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; @@ -134,7 +134,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsSes }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[0], + &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 @@ -168,7 +168,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CertificateP }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CertificateProviderPluginInstance_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; @@ -179,7 +179,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Subjec }; 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__submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SubjectAltNameMatcher__fields[0], UPB_SIZE(32, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -194,7 +194,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SubjectAltNa }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SubjectAltNameMatcher_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[10] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__submsgs[10] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, @@ -226,7 +226,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Certif }; 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__submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[0], UPB_SIZE(72, 120), 15, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED 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 fe8e941069..7a93da32a9 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -43,4 +43,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_common_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 652e2367dd..26814aec16 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -383,4 +383,4 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_GenericSecret* envoy #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_H_ */ 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 5e6cbde9c8..37fdcc1599 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 @@ -21,7 +21,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_GenericSecret__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; @@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Generi }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_GenericSecret_submsgs[0], + &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 @@ -39,7 +39,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__GenericSecre }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__GenericSecret_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ConfigSource_msg_init_ptr}, }; @@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SdsSec }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[0], + &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 @@ -62,7 +62,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SdsSecretCon }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_Secret__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsSessionTicketKeys_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr}, @@ -78,7 +78,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Secret }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__Secret_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h index a7df95d18c..243ec808b0 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_secret_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 0f23e4efb3..965d7d3214 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1619,4 +1619,4 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_Cer #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_H_ */ 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 805e4f0658..f6c085ee74 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 @@ -24,7 +24,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, @@ -39,7 +39,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Upstre }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_submsgs[0], + &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 @@ -54,7 +54,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsC }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__UpstreamTlsContext_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[7] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext__submsgs[7] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__BoolValue_msg_init_ptr}, @@ -78,7 +78,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Downst }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_submsgs[0], + &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 @@ -105,7 +105,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__DownstreamTl }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__DownstreamTlsContext_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_TlsKeyLog__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__CidrRange_msg_init_ptr}, }; @@ -117,7 +117,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_TlsKey }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_TlsKeyLog_submsgs[0], + &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 @@ -132,7 +132,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_ms }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__TlsKeyLog_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[13] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext__submsgs[13] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsParameters_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__TlsCertificate_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr}, @@ -166,7 +166,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Common }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_submsgs[0], + &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 @@ -193,7 +193,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -203,7 +203,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Common }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProvider_submsgs[0], + &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 @@ -239,7 +239,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsCon }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProviderInstance_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CertificateValidationContext_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SdsSecretConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CertificateProvider_msg_init_ptr}, @@ -254,7 +254,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_Common }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__CommonTlsContext__CombinedCertificateValidationContext_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h index f562352ea4..e6a4a54882 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_pro #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 b622debd1b..18d5bf0562 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -225,4 +225,4 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_H_ */ 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 f9d6847d91..323eb1b01b 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFE }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_submsgs[0], + &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 @@ -39,7 +39,7 @@ const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertVa }; const upb_MiniTable* envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init_ptr = &envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__DataSource_msg_init_ptr}, }; @@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_extensions_transport_sockets_tls_v3_SPIFFE }; const upb_MiniTable envoy__extensions__transport_0sockets__tls__v3__SPIFFECertValidatorConfig__TrustDomain_msg_init = { - &envoy_extensions_transport_sockets_tls_v3_SPIFFECertValidatorConfig_TrustDomain_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h index d6817d60b3..ca463e6cde 100644 --- a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_extensions_transport_sockets_tls_v3_tls_spi #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 4a73cb9d20..1d6c75b5c2 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H_ -#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H_ +#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_H_ +#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -768,4 +768,4 @@ UPB_INLINE struct envoy_config_core_v3_AlternateProtocolsCacheOptions* envoy_ext #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H_ */ +#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_H_ */ 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 84118d2a12..53fac54267 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_submsgs[7] = { +static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions__submsgs[7] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__HttpProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__UpstreamHttpProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init_ptr}, @@ -40,7 +40,7 @@ static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolO }; const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init = { - &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_submsgs[0], + &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 @@ -59,7 +59,7 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ }; const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr}, @@ -72,7 +72,7 @@ static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolO }; const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init = { - &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_ExplicitHttpConfig_submsgs[0], + &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 @@ -87,7 +87,7 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ }; const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__ExplicitHttpConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr}, @@ -100,7 +100,7 @@ static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolO }; const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init = { - &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_UseDownstreamHttpConfig_submsgs[0], + &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 @@ -109,7 +109,7 @@ const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions_ }; const upb_MiniTable* envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init_ptr = &envoy__extensions__upstreams__http__v3__HttpProtocolOptions__UseDownstreamHttpConfig_msg_init; -static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http1ProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http2ProtocolOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Http3ProtocolOptions_msg_init_ptr}, @@ -124,7 +124,7 @@ static const upb_MiniTableField envoy_extensions_upstreams_http_v3_HttpProtocolO }; const upb_MiniTable envoy__extensions__upstreams__http__v3__HttpProtocolOptions__AutoHttpConfig_msg_init = { - &envoy_extensions_upstreams_http_v3_HttpProtocolOptions_AutoHttpConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h index 6eaf0d58c2..0b595e844c 100644 --- a/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_extensions_upstreams_http_v3_http_protocol_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h index 147bc33f0d..df1b6b742f 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ -#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ +#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_H_ +#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -72,4 +72,4 @@ UPB_INLINE char* envoy_service_discovery_v3_AdsDummy_serialize_ex(const envoy_se #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H_ */ +#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h index 90fb109d57..a44f9d71cd 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/ads.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_service_discovery_v3_ads_proto_upb_file_lay #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 eaaf3fe236..107fe80d61 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_ -#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_ +#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_H_ +#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -2276,4 +2276,4 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_CacheControl_set_do_not_cach #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H_ */ +#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_H_ */ 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 5793ae610b..ffd2773f0b 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 @@ -21,7 +21,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceLocator_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceLocator__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_ResourceLocator__fiel }; const upb_MiniTable envoy__service__discovery__v3__ResourceLocator_msg_init = { - &envoy_service_discovery_v3_ResourceLocator_submsgs[0], + &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 @@ -65,7 +65,7 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceLocator__DynamicParam }; const upb_MiniTable* envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init_ptr = &envoy__service__discovery__v3__ResourceLocator__DynamicParametersEntry_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceName_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_ResourceName__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr}, }; @@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_ResourceName__fields[ }; const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init = { - &envoy_service_discovery_v3_ResourceName_submsgs[0], + &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 @@ -88,7 +88,7 @@ const upb_MiniTable envoy__service__discovery__v3__ResourceName_msg_init = { }; const upb_MiniTable* envoy__service__discovery__v3__ResourceName_msg_init_ptr = &envoy__service__discovery__v3__ResourceName_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryRequest_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryRequest__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__rpc__Status_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceLocator_msg_init_ptr}, @@ -105,7 +105,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryRequest__fie }; const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init = { - &envoy_service_discovery_v3_DiscoveryRequest_submsgs[0], + &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 @@ -124,7 +124,7 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryRequest_msg_init = { }; const upb_MiniTable* envoy__service__discovery__v3__DiscoveryRequest_msg_init_ptr = &envoy__service__discovery__v3__DiscoveryRequest_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryResponse_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DiscoveryResponse__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ControlPlane_msg_init_ptr}, }; @@ -139,7 +139,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DiscoveryResponse__fi }; const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init = { - &envoy_service_discovery_v3_DiscoveryResponse_submsgs[0], + &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 @@ -158,7 +158,7 @@ const upb_MiniTable envoy__service__discovery__v3__DiscoveryResponse_msg_init = }; const upb_MiniTable* envoy__service__discovery__v3__DiscoveryResponse_msg_init_ptr = &envoy__service__discovery__v3__DiscoveryResponse_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryRequest__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__rpc__Status_msg_init_ptr}, @@ -179,7 +179,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRequest }; const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest_msg_init = { - &envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[0], + &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 @@ -227,7 +227,7 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryRequest__Initia }; const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init_ptr = &envoy__service__discovery__v3__DeltaDiscoveryRequest__InitialResourceVersionsEntry_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DeltaDiscoveryResponse__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__Resource_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__ControlPlane_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__ResourceName_msg_init_ptr}, @@ -244,7 +244,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DeltaDiscoveryRespons }; const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init = { - &envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[0], + &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 @@ -271,7 +271,7 @@ const upb_MiniTable envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_in }; const upb_MiniTable* envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init_ptr = &envoy__service__discovery__v3__DeltaDiscoveryResponse_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr}, @@ -286,7 +286,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConst }; const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_msg_init = { - &envoy_service_discovery_v3_DynamicParameterConstraints_submsgs[0], + &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 @@ -305,7 +305,7 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints_m }; const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init_ptr}, }; @@ -316,7 +316,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConst }; const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint_msg_init = { - &envoy_service_discovery_v3_DynamicParameterConstraints_SingleConstraint_submsgs[0], + &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 @@ -341,7 +341,7 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ }; const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints__SingleConstraint__Exists_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__DynamicParameterConstraints_msg_init_ptr}, }; @@ -350,7 +350,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_DynamicParameterConst }; const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init = { - &envoy_service_discovery_v3_DynamicParameterConstraints_ConstraintList_submsgs[0], + &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 @@ -363,7 +363,7 @@ const upb_MiniTable envoy__service__discovery__v3__DynamicParameterConstraints__ }; const upb_MiniTable* envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init_ptr = &envoy__service__discovery__v3__DynamicParameterConstraints__ConstraintList_msg_init; -static const upb_MiniTableSubInternal envoy_service_discovery_v3_Resource_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_service_discovery_v3_Resource__submsgs[5] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__service__discovery__v3__Resource__CacheControl_msg_init_ptr}, @@ -383,7 +383,7 @@ static const upb_MiniTableField envoy_service_discovery_v3_Resource__fields[8] = }; const upb_MiniTable envoy__service__discovery__v3__Resource_msg_init = { - &envoy_service_discovery_v3_Resource_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h index 95a5c2f72e..6f02a36593 100644 --- a/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/service/discovery/v3/discovery.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_ -#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -55,4 +55,4 @@ extern const upb_MiniTableFile envoy_service_discovery_v3_discovery_proto_upb_fi #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 fab8ea107d..c30e6e2da9 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_ -#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_ +#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_H_ +#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -335,4 +335,4 @@ UPB_INLINE void envoy_service_load_stats_v3_LoadStatsResponse_set_send_all_clust #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H_ */ +#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_H_ */ 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 08ef903046..ebbf930430 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsRequest_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsRequest__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__endpoint__v3__ClusterStats_msg_init_ptr}, }; @@ -30,7 +30,7 @@ static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsRequest__fi }; 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__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 @@ -45,7 +45,7 @@ const upb_MiniTable envoy__service__load_0stats__v3__LoadStatsRequest_msg_init = }; const upb_MiniTable* envoy__service__load_0stats__v3__LoadStatsRequest_msg_init_ptr = &envoy__service__load_0stats__v3__LoadStatsRequest_msg_init; -static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsResponse_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_service_load_stats_v3_LoadStatsResponse__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -57,7 +57,7 @@ static const upb_MiniTableField envoy_service_load_stats_v3_LoadStatsResponse__f }; 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__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 diff --git a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h index cdcb76f952..4c348ad5bb 100644 --- a/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/service/load_stats/v3/lrs.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_service_load_stats_v3_lrs_proto_upb_file_la #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 05c78f8dfc..918680e050 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ -#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ +#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_H_ +#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1000,4 +1000,4 @@ UPB_INLINE struct envoy_service_status_v3_ClientConfig* envoy_service_status_v3_ #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ */ +#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_H_ */ 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 b84e5136cc..e348dfd002 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 @@ -23,7 +23,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusRequest_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusRequest__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__NodeMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, }; @@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_service_status_v3_ClientStatusRequest__fie }; const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init = { - &envoy_service_status_v3_ClientStatusRequest_submsgs[0], + &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 @@ -50,7 +50,7 @@ const upb_MiniTable envoy__service__status__v3__ClientStatusRequest_msg_init = { }; const upb_MiniTable* envoy__service__status__v3__ClientStatusRequest_msg_init_ptr = &envoy__service__status__v3__ClientStatusRequest_msg_init; -static const upb_MiniTableSubInternal envoy_service_status_v3_PerXdsConfig_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_service_status_v3_PerXdsConfig__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ListenersConfigDump_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__ClustersConfigDump_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__RoutesConfigDump_msg_init_ptr}, @@ -69,7 +69,7 @@ static const upb_MiniTableField envoy_service_status_v3_PerXdsConfig__fields[7] }; const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init = { - &envoy_service_status_v3_PerXdsConfig_submsgs[0], + &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 @@ -88,7 +88,7 @@ const upb_MiniTable envoy__service__status__v3__PerXdsConfig_msg_init = { }; const upb_MiniTable* envoy__service__status__v3__PerXdsConfig_msg_init_ptr = &envoy__service__status__v3__PerXdsConfig_msg_init; -static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__Node_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__PerXdsConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init_ptr}, @@ -102,7 +102,7 @@ static const upb_MiniTableField envoy_service_status_v3_ClientConfig__fields[4] }; const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init = { - &envoy_service_status_v3_ClientConfig_submsgs[0], + &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 @@ -121,7 +121,7 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig_msg_init = { }; const upb_MiniTable* envoy__service__status__v3__ClientConfig_msg_init_ptr = &envoy__service__status__v3__ClientConfig_msg_init; -static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[3] = { +static const upb_MiniTableSubInternal envoy_service_status_v3_ClientConfig_GenericXdsConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__admin__v3__UpdateFailureState_msg_init_ptr}, @@ -140,7 +140,7 @@ static const upb_MiniTableField envoy_service_status_v3_ClientConfig_GenericXdsC }; const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init = { - &envoy_service_status_v3_ClientConfig_GenericXdsConfig_submsgs[0], + &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 @@ -167,7 +167,7 @@ const upb_MiniTable envoy__service__status__v3__ClientConfig__GenericXdsConfig_m }; const upb_MiniTable* envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init_ptr = &envoy__service__status__v3__ClientConfig__GenericXdsConfig_msg_init; -static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusResponse_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_service_status_v3_ClientStatusResponse__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__service__status__v3__ClientConfig_msg_init_ptr}, }; @@ -176,7 +176,7 @@ static const upb_MiniTableField envoy_service_status_v3_ClientStatusResponse__fi }; const upb_MiniTable envoy__service__status__v3__ClientStatusResponse_msg_init = { - &envoy_service_status_v3_ClientStatusResponse_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h index 07d360f42f..295aa79282 100644 --- a/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_service_status_v3_csds_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 179fbe3e28..9a69d53d8d 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_ -#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -135,4 +135,4 @@ UPB_INLINE void envoy_type_http_v3_Cookie_set_path(envoy_type_http_v3_Cookie *ms #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_H_ */ 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 fd87b4de2f..684c88f999 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_http_v3_Cookie_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_http_v3_Cookie__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_type_http_v3_Cookie__fields[3] = { }; const upb_MiniTable envoy__type__http__v3__Cookie_msg_init = { - &envoy_type_http_v3_Cookie_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h index 109b94018b..9967d424fa 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_http_v3_cookie_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 57c4f05a6d..b12b94c859 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_ -#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -325,4 +325,4 @@ UPB_INLINE char* envoy_type_http_v3_PathTransformation_Operation_MergeSlashes_se #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_H_ */ 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 7197abbfd5..b02ffa8e51 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 @@ -16,7 +16,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation_msg_init_ptr}, }; @@ -25,7 +25,7 @@ static const upb_MiniTableField envoy_type_http_v3_PathTransformation__fields[1] }; const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init = { - &envoy_type_http_v3_PathTransformation_submsgs[0], + &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 @@ -38,7 +38,7 @@ const upb_MiniTable envoy__type__http__v3__PathTransformation_msg_init = { }; const upb_MiniTable* envoy__type__http__v3__PathTransformation_msg_init_ptr = &envoy__type__http__v3__PathTransformation_msg_init; -static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation_Operation_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_http_v3_PathTransformation_Operation__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation__NormalizePathRFC3986_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__http__v3__PathTransformation__Operation__MergeSlashes_msg_init_ptr}, }; @@ -49,7 +49,7 @@ static const upb_MiniTableField envoy_type_http_v3_PathTransformation_Operation_ }; const upb_MiniTable envoy__type__http__v3__PathTransformation__Operation_msg_init = { - &envoy_type_http_v3_PathTransformation_Operation_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h index 27d742c58d..bfbecd7fc5 100644 --- a/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_type_http_v3_path_transformation_proto_upb_ #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 f18ab285bf..cc9cc6c227 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -128,4 +128,4 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Fil #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_H_ */ 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 f1f79d4e80..e7d3bcb8c9 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_FilterStateMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_FilterStateMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_FilterStateMatcher__fields }; const upb_MiniTable envoy__type__matcher__v3__FilterStateMatcher_msg_init = { - &envoy_type_matcher_v3_FilterStateMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h index 9477a7b197..41b739f725 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_filter_state_proto_upb_file #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 5d8758b8f3..1d4ca31fa9 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -307,4 +307,4 @@ UPB_INLINE void envoy_type_matcher_v3_HttpRequestQueryParamMatchInput_set_query_ #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h index 99ec0f45fa..4f2fb8b8b2 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_http_inputs_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 77ec26ba48..4a0fa17587 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -271,4 +271,4 @@ UPB_INLINE void envoy_type_matcher_v3_MetadataMatcher_PathSegment_set_key(envoy_ #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_H_ */ 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 4a15c4f545..a3b6c30a61 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_MetadataMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_MetadataMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__MetadataMatcher__PathSegment_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_MetadataMatcher__fields[4] }; const upb_MiniTable envoy__type__matcher__v3__MetadataMatcher_msg_init = { - &envoy_type_matcher_v3_MetadataMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h index a157502cb5..1a6e95dfa0 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_metadata_proto_upb_file_lay #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7473342c82..589937dd7e 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -172,4 +172,4 @@ UPB_INLINE struct envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_Nod #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_H_ */ 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 25d9d598e7..6937c5a5be 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_NodeMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_NodeMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StructMatcher_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_NodeMatcher__fields[2] = { }; const upb_MiniTable envoy__type__matcher__v3__NodeMatcher_msg_init = { - &envoy_type_matcher_v3_NodeMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h index 6fb41d5c65..a78af843e2 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/node.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_node_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7d9d0222dc..020a0b5729 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -134,4 +134,4 @@ UPB_INLINE void envoy_type_matcher_v3_DoubleMatcher_set_exact(envoy_type_matcher #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_H_ */ 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 268878b1bc..b8884e9e9f 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_DoubleMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_DoubleMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__DoubleRange_msg_init_ptr}, }; @@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_DoubleMatcher__fields[2] = }; const upb_MiniTable envoy__type__matcher__v3__DoubleMatcher_msg_init = { - &envoy_type_matcher_v3_DoubleMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h index 7190e62a91..9beadb3352 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/number.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_number_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 66cd683ce0..a3ffdaa4f9 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -113,4 +113,4 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Pat #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_H_ */ 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 997691d98d..350f442ba6 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_PathMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_PathMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_PathMatcher__fields[1] = { }; const upb_MiniTable envoy__type__matcher__v3__PathMatcher_msg_init = { - &envoy_type_matcher_v3_PathMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h index 8a7d00590c..2af9a3a7de 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/path.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_path_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 b2faf366a5..646f41fa9e 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -284,4 +284,4 @@ UPB_INLINE void envoy_type_matcher_v3_RegexMatchAndSubstitute_set_substitution(e #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ */ 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 e99f0a58a0..bdd16a2c04 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher__fields[2] = }; const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init = { - &envoy_type_matcher_v3_RegexMatcher_submsgs[0], + &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 @@ -44,7 +44,7 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher_msg_init = { }; const upb_MiniTable* envoy__type__matcher__v3__RegexMatcher_msg_init_ptr = &envoy__type__matcher__v3__RegexMatcher_msg_init; -static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher_GoogleRE2_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatcher_GoogleRE2__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -53,7 +53,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_RegexMatcher_GoogleRE2__fi }; 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__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 @@ -62,7 +62,7 @@ const upb_MiniTable envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init = }; const upb_MiniTable* envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr = &envoy__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init; -static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_RegexMatchAndSubstitute__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr}, }; @@ -72,7 +72,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_RegexMatchAndSubstitute__f }; const upb_MiniTable envoy__type__matcher__v3__RegexMatchAndSubstitute_msg_init = { - &envoy_type_matcher_v3_RegexMatchAndSubstitute_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h index 2ac7b428ba..74dc218ed5 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/regex.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_regex_proto_upb_file_layout #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h index 7985bdaa74..0d344feac6 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -109,4 +109,4 @@ UPB_INLINE char* envoy_type_matcher_v3_HttpResponseStatusCodeClassMatchInput_ser #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h index dc3f52e507..bf7fafb5a1 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/status_code_input.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_status_code_input_proto_upb #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 00a059731a..3aa543af40 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -352,4 +352,4 @@ UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_Lis #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ */ 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 9fe42b9767..352fd5a331 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_StringMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_StringMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__RegexMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -35,7 +35,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_StringMatcher__fields[7] = }; const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = { - &envoy_type_matcher_v3_StringMatcher_submsgs[0], + &envoy_type_matcher_v3_StringMatcher__submsgs[0], &envoy_type_matcher_v3_StringMatcher__fields[0], UPB_SIZE(24, 32), 7, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -62,7 +62,7 @@ const upb_MiniTable envoy__type__matcher__v3__StringMatcher_msg_init = { }; const upb_MiniTable* envoy__type__matcher__v3__StringMatcher_msg_init_ptr = &envoy__type__matcher__v3__StringMatcher_msg_init; -static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListStringMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListStringMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, }; @@ -71,7 +71,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_ListStringMatcher__fields[ }; const upb_MiniTable envoy__type__matcher__v3__ListStringMatcher_msg_init = { - &envoy_type_matcher_v3_ListStringMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h index 2a931f6584..0662b98e54 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/string.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_string_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 75f10611b7..97b5447431 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -239,4 +239,4 @@ UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_set_key(envoy_ty #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_H_ */ 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 64ddc3a702..17ee3b4253 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_StructMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_StructMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StructMatcher__PathSegment_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_StructMatcher__fields[2] = }; const upb_MiniTable envoy__type__matcher__v3__StructMatcher_msg_init = { - &envoy_type_matcher_v3_StructMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h index e5e0662466..fad11d86c9 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/struct.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_struct_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 d68504fe09..2870e8bfaa 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_ -#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -504,4 +504,4 @@ UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_OrMa #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_H_ */ 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 a6e3b476ec..eb0ab75956 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_matcher_v3_ValueMatcher_submsgs[5] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_ValueMatcher__submsgs[5] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__DoubleMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__StringMatcher_msg_init_ptr}, @@ -38,7 +38,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_ValueMatcher__fields[7] = }; const upb_MiniTable envoy__type__matcher__v3__ValueMatcher_msg_init = { - &envoy_type_matcher_v3_ValueMatcher_submsgs[0], + &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 @@ -67,7 +67,7 @@ const upb_MiniTable envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init = }; const upb_MiniTable* envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init_ptr = &envoy__type__matcher__v3__ValueMatcher__NullMatch_msg_init; -static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_ListMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr}, }; @@ -76,7 +76,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_ListMatcher__fields[1] = { }; const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init = { - &envoy_type_matcher_v3_ListMatcher_submsgs[0], + &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 @@ -89,7 +89,7 @@ const upb_MiniTable envoy__type__matcher__v3__ListMatcher_msg_init = { }; const upb_MiniTable* envoy__type__matcher__v3__ListMatcher_msg_init_ptr = &envoy__type__matcher__v3__ListMatcher_msg_init; -static const upb_MiniTableSubInternal envoy_type_matcher_v3_OrMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_matcher_v3_OrMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__matcher__v3__ValueMatcher_msg_init_ptr}, }; @@ -98,7 +98,7 @@ static const upb_MiniTableField envoy_type_matcher_v3_OrMatcher__fields[1] = { }; const upb_MiniTable envoy__type__matcher__v3__OrMatcher_msg_init = { - &envoy_type_matcher_v3_OrMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h index c20dc81a36..275d3b182d 100644 --- a/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/matcher/v3/value.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile envoy_type_matcher_v3_value_proto_upb_file_layout #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 b5da11c4d5..03f3a934d4 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ -#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -550,4 +550,4 @@ UPB_INLINE char* envoy_type_metadata_v3_MetadataKind_Host_serialize_ex(const env #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_H_ */ 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 5e474bd440..b605498b34 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKey_submsgs[1] = { +static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKey__submsgs[1] = { {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField envoy_type_metadata_v3_MetadataKey__fields[2] = }; const upb_MiniTable envoy__type__metadata__v3__MetadataKey_msg_init = { - &envoy_type_metadata_v3_MetadataKey_submsgs[0], + &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 @@ -60,7 +60,7 @@ const upb_MiniTable envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init }; const upb_MiniTable* envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init_ptr = &envoy__type__metadata__v3__MetadataKey__PathSegment_msg_init; -static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKind_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_type_metadata_v3_MetadataKind__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Request_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Route_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind__Cluster_msg_init_ptr}, @@ -75,7 +75,7 @@ static const upb_MiniTableField envoy_type_metadata_v3_MetadataKind__fields[4] = }; const upb_MiniTable envoy__type__metadata__v3__MetadataKind_msg_init = { - &envoy_type_metadata_v3_MetadataKind_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h index 2d47859658..cae6700d06 100644 --- a/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/metadata/v3/metadata.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -41,4 +41,4 @@ extern const upb_MiniTableFile envoy_type_metadata_v3_metadata_proto_upb_file_la #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 93f025325e..62729ecc46 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_ -#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -535,4 +535,4 @@ UPB_INLINE void envoy_type_tracing_v3_CustomTag_Metadata_set_default_value(envoy #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_H_ */ 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 c84c1071af..52331fe145 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag_submsgs[4] = { +static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag__submsgs[4] = { {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Literal_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Environment_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__tracing__v3__CustomTag__Header_msg_init_ptr}, @@ -34,7 +34,7 @@ static const upb_MiniTableField envoy_type_tracing_v3_CustomTag__fields[5] = { }; const upb_MiniTable envoy__type__tracing__v3__CustomTag_msg_init = { - &envoy_type_tracing_v3_CustomTag_submsgs[0], + &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 @@ -113,7 +113,7 @@ const upb_MiniTable envoy__type__tracing__v3__CustomTag__Header_msg_init = { }; const upb_MiniTable* envoy__type__tracing__v3__CustomTag__Header_msg_init_ptr = &envoy__type__tracing__v3__CustomTag__Header_msg_init; -static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag_Metadata_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_tracing_v3_CustomTag_Metadata__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKind_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__metadata__v3__MetadataKey_msg_init_ptr}, }; @@ -125,7 +125,7 @@ static const upb_MiniTableField envoy_type_tracing_v3_CustomTag_Metadata__fields }; 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__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 diff --git a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h index bb56ee9735..a80c1cf93f 100644 --- a/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/tracing/v3/custom_tag.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -37,4 +37,4 @@ extern const upb_MiniTableFile envoy_type_tracing_v3_custom_tag_proto_upb_file_l #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 ca2c40ea3a..ec2e04dfeb 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -236,4 +236,4 @@ UPB_INLINE void envoy_type_v3_HashPolicy_FilterState_set_key(envoy_type_v3_HashP #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_H_ */ 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 1b4ab88524..d6c62c6fca 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_v3_HashPolicy_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_v3_HashPolicy__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__HashPolicy__SourceIp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__HashPolicy__FilterState_msg_init_ptr}, }; @@ -28,7 +28,7 @@ static const upb_MiniTableField envoy_type_v3_HashPolicy__fields[2] = { }; const upb_MiniTable envoy__type__v3__HashPolicy_msg_init = { - &envoy_type_v3_HashPolicy_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h index ef43312527..55fb17bddd 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/hash_policy.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_type_v3_hash_policy_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb.h b/src/core/ext/upb-gen/envoy/type/v3/http.upb.h index 5c8d0035b6..919a87fbc7 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -36,4 +36,4 @@ typedef enum { #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h index a08e816387..4aa73bc6b4 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/http.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -27,4 +27,4 @@ extern const upb_MiniTableFile envoy_type_v3_http_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 99c392180e..50ee61cdd7 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -148,4 +148,4 @@ UPB_INLINE void envoy_type_v3_HttpStatus_set_code(envoy_type_v3_HttpStatus *msg, #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h index 8f71d7e316..616cb5fc40 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/http_status.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_v3_http_status_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 6d211675c9..47d15c5080 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -165,4 +165,4 @@ UPB_INLINE void envoy_type_v3_FractionalPercent_set_denominator(envoy_type_v3_Fr #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h index b9eb6640fa..f66618c963 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/percent.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_v3_percent_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 78fc3a5831..bb5451e670 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -245,4 +245,4 @@ UPB_INLINE void envoy_type_v3_DoubleRange_set_end(envoy_type_v3_DoubleRange *msg #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h index 006971ebc2..4ef1ad441e 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/range.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile envoy_type_v3_range_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 060177c296..e97c8a4228 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -242,4 +242,4 @@ UPB_INLINE void envoy_type_v3_RateLimitStrategy_RequestsPerTimeUnit_set_time_uni #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_H_ */ 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 7a4ff32fd9..ff9a468edc 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_v3_RateLimitStrategy_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_v3_RateLimitStrategy__submsgs[2] = { {.UPB_PRIVATE(submsg) = &envoy__type__v3__RateLimitStrategy__RequestsPerTimeUnit_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &envoy__type__v3__TokenBucket_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_type_v3_RateLimitStrategy__fields[3] = { }; const upb_MiniTable envoy__type__v3__RateLimitStrategy_msg_init = { - &envoy_type_v3_RateLimitStrategy_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h index 6d696d1ce8..8a8432cce7 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_strategy.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile envoy_type_v3_ratelimit_strategy_proto_upb_file_l #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h index 0e03ae6472..af5bdfc242 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -40,4 +40,4 @@ typedef enum { #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h index 1a76472912..57963d0f26 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/ratelimit_unit.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -27,4 +27,4 @@ extern const upb_MiniTableFile envoy_type_v3_ratelimit_unit_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 f472ac3a66..d244b3beac 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -119,4 +119,4 @@ UPB_INLINE void envoy_type_v3_SemanticVersion_set_patch(envoy_type_v3_SemanticVe #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h index 6611d2e608..5a0dfcf902 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/semantic_version.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_v3_semantic_version_proto_upb_file_lay #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 86fb062011..c14d534b93 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_ -#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_ +#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_H_ +#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -152,4 +152,4 @@ UPB_INLINE struct google_protobuf_Duration* envoy_type_v3_TokenBucket_mutable_fi #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H_ */ +#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_H_ */ 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 4ee1428130..af5fd21419 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal envoy_type_v3_TokenBucket_submsgs[2] = { +static const upb_MiniTableSubInternal envoy_type_v3_TokenBucket__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField envoy_type_v3_TokenBucket__fields[3] = { }; const upb_MiniTable envoy__type__v3__TokenBucket_msg_init = { - &envoy_type_v3_TokenBucket_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h index 20a72de42c..1ef0eb7e82 100644 --- a/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h +++ b/src/core/ext/upb-gen/envoy/type/v3/token_bucket.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_ -#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_ +#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_MINITABLE_H_ +#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile envoy_type_v3_token_bucket_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_MINITABLE_H_ */ +#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 5130ecc66d..dee07c6469 100644 --- a/src/core/ext/upb-gen/google/api/annotations.upb.h +++ b/src/core/ext/upb-gen/google/api/annotations.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_ -#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_ +#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_H_ +#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -36,7 +36,7 @@ UPB_INLINE const struct google_api_HttpRule* google_api_http(const struct google const upb_MiniTableExtension* ext = &google_api_http_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const struct google_api_HttpRule* default_val = NULL; const struct google_api_HttpRule* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -46,7 +46,7 @@ UPB_INLINE void google_api_set_http(struct google_protobuf_MethodOptions* msg, c const upb_MiniTableExtension* ext = &google_api_http_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -65,4 +65,4 @@ UPB_INLINE struct google_api_HttpRule* google_api_mutable_http(struct google_pro #include "upb/port/undef.inc" -#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_H_ */ +#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c index fc0e3d6e67..aa3a4acedb 100644 --- a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c +++ b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.c @@ -18,7 +18,7 @@ extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension google_api_http_ext = { - {72295728, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {72295728, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__MethodOptions_msg_init, {.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init}, diff --git a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h index 101b37d51e..c971809faa 100644 --- a/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/annotations.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -28,4 +28,4 @@ extern const upb_MiniTableFile google_api_annotations_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 8a1b0be2fd..0109d925b0 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_ -#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_ +#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_H_ +#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1896,4 +1896,4 @@ UPB_INLINE struct google_api_expr_v1alpha1_Constant* google_api_expr_v1alpha1_Re #include "upb/port/undef.inc" -#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H_ */ +#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_H_ */ 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 5cc5108024..98a424fb85 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_submsgs[4] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, @@ -33,7 +33,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr__fields[5] }; const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init = { - &google_api_expr_v1alpha1_CheckedExpr_submsgs[0], + &google_api_expr_v1alpha1_CheckedExpr__submsgs[0], &google_api_expr_v1alpha1_CheckedExpr__fields[0], UPB_SIZE(40, 64), 5, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -52,7 +52,7 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Reference_msg_init_ptr}, }; @@ -62,7 +62,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_ReferenceMa }; const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init = { - &google_api_expr_v1alpha1_CheckedExpr_ReferenceMapEntry_submsgs[0], + &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 @@ -75,7 +75,7 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_ }; const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr__ReferenceMapEntry_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; @@ -85,7 +85,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_CheckedExpr_TypeMapEntr }; const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init = { - &google_api_expr_v1alpha1_CheckedExpr_TypeMapEntry_submsgs[0], + &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 @@ -98,7 +98,7 @@ const upb_MiniTable google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_i }; const upb_MiniTable* google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init_ptr = &google__api__expr__v1alpha1__CheckedExpr__TypeMapEntry_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_submsgs[7] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Empty_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__ListType_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type__MapType_msg_init_ptr}, @@ -125,7 +125,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type__fields[13] = { }; const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init = { - &google_api_expr_v1alpha1_Type_submsgs[0], + &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 @@ -152,7 +152,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Type_msg_init_ptr = &google__api__expr__v1alpha1__Type_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_ListType_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_ListType__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; @@ -161,7 +161,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type_ListType__fields[1 }; 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__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 @@ -170,7 +170,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__ListType_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Type__ListType_msg_init_ptr = &google__api__expr__v1alpha1__Type__ListType_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_MapType_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_MapType__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; @@ -181,7 +181,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type_MapType__fields[2] }; 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__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 @@ -190,7 +190,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__MapType_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Type__MapType_msg_init_ptr = &google__api__expr__v1alpha1__Type__MapType_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_FunctionType_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_FunctionType__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; @@ -201,7 +201,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type_FunctionType__fiel }; 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__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 @@ -216,7 +216,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__FunctionType_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Type__FunctionType_msg_init_ptr = &google__api__expr__v1alpha1__Type__FunctionType_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_AbstractType_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Type_AbstractType__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; @@ -226,7 +226,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Type_AbstractType__fiel }; 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__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 @@ -241,7 +241,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Type__AbstractType_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Type__AbstractType_msg_init_ptr = &google__api__expr__v1alpha1__Type__AbstractType_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init_ptr}, }; @@ -253,7 +253,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Decl__fields[3] = { }; const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init = { - &google_api_expr_v1alpha1_Decl_submsgs[0], + &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 @@ -268,7 +268,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Decl_msg_init_ptr = &google__api__expr__v1alpha1__Decl_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_IdentDecl_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_IdentDecl__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr}, }; @@ -280,7 +280,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Decl_IdentDecl__fields[ }; 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__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 @@ -295,7 +295,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__IdentDecl_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Decl__IdentDecl_msg_init_ptr = &google__api__expr__v1alpha1__Decl__IdentDecl_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init_ptr}, }; @@ -304,7 +304,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl__fiel }; 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__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 @@ -317,7 +317,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init_ptr = &google__api__expr__v1alpha1__Decl__FunctionDecl_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Decl_FunctionDecl_Overload__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Type_msg_init_ptr}, }; @@ -332,7 +332,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Decl_FunctionDecl_Overl }; const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init = { - &google_api_expr_v1alpha1_Decl_FunctionDecl_Overload_submsgs[0], + &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 @@ -351,7 +351,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_ms }; const upb_MiniTable* google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init_ptr = &google__api__expr__v1alpha1__Decl__FunctionDecl__Overload_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Reference_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Reference__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr}, }; @@ -362,7 +362,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Reference__fields[3] = }; const upb_MiniTable google__api__expr__v1alpha1__Reference_msg_init = { - &google_api_expr_v1alpha1_Reference_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h index b99fbb2074..fba0e3d050 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/checked.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -53,4 +53,4 @@ extern const upb_MiniTableFile google_api_expr_v1alpha1_checked_proto_upb_file_l #include "upb/port/undef.inc" -#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c27267eb43..b2999deef6 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_ -#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_ +#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_H_ +#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -2354,4 +2354,4 @@ UPB_INLINE void google_api_expr_v1alpha1_SourcePosition_set_column(google_api_ex #include "upb/port/undef.inc" -#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H_ */ +#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_H_ */ 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 7f4d6951b2..a2426af257 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_ParsedExpr_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_ParsedExpr__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo_msg_init_ptr}, }; @@ -28,7 +28,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_ParsedExpr__fields[2] = }; const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init = { - &google_api_expr_v1alpha1_ParsedExpr_submsgs[0], + &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 @@ -37,7 +37,7 @@ const upb_MiniTable google__api__expr__v1alpha1__ParsedExpr_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__ParsedExpr_msg_init_ptr = &google__api__expr__v1alpha1__ParsedExpr_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_submsgs[7] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Constant_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Ident_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__Select_msg_init_ptr}, @@ -59,7 +59,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr__fields[8] = { }; const upb_MiniTable google__api__expr__v1alpha1__Expr_msg_init = { - &google_api_expr_v1alpha1_Expr_submsgs[0], + &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 @@ -104,7 +104,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Ident_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Expr__Ident_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Ident_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Select_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Select__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; @@ -115,7 +115,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Select__fields[3] }; 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__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 @@ -130,7 +130,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Select_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Expr__Select_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Select_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Call_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Call__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; @@ -142,7 +142,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Call__fields[3] = }; 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__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 @@ -157,7 +157,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Call_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Expr__Call_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Call_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateList_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; @@ -167,7 +167,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateList__fields }; 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__submsgs[0], &google_api_expr_v1alpha1_Expr_CreateList__fields[0], UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -182,7 +182,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateList_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateList_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateList_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init_ptr}, }; @@ -192,7 +192,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct__fiel }; 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__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 @@ -207,7 +207,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateStruct_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateStruct_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_CreateStruct_Entry__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; @@ -221,7 +221,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_CreateStruct_Entry }; const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init = { - &google_api_expr_v1alpha1_Expr_CreateStruct_Entry_submsgs[0], + &google_api_expr_v1alpha1_Expr_CreateStruct_Entry__submsgs[0], &google_api_expr_v1alpha1_Expr_CreateStruct_Entry__fields[0], UPB_SIZE(40, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -240,7 +240,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_i }; const upb_MiniTable* google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init_ptr = &google__api__expr__v1alpha1__Expr__CreateStruct__Entry_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Comprehension_submsgs[5] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Expr_Comprehension__submsgs[5] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, @@ -260,7 +260,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Expr_Comprehension__fie }; 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__submsgs[0], &google_api_expr_v1alpha1_Expr_Comprehension__fields[0], UPB_SIZE(56, 104), 8, kUpb_ExtMode_NonExtendable, 8, UPB_FASTTABLE_MASK(120), 0, #ifdef UPB_TRACING_ENABLED @@ -287,7 +287,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Expr__Comprehension_msg_init = }; const upb_MiniTable* google__api__expr__v1alpha1__Expr__Comprehension_msg_init_ptr = &google__api__expr__v1alpha1__Expr__Comprehension_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Constant_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_Constant__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, }; @@ -305,7 +305,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_Constant__fields[9] = { }; const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = { - &google_api_expr_v1alpha1_Constant_submsgs[0], + &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 @@ -332,7 +332,7 @@ const upb_MiniTable google__api__expr__v1alpha1__Constant_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__Constant_msg_init_ptr = &google__api__expr__v1alpha1__Constant_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_submsgs[3] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension_msg_init_ptr}, @@ -348,7 +348,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo__fields[6] = }; const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init = { - &google_api_expr_v1alpha1_SourceInfo_submsgs[0], + &google_api_expr_v1alpha1_SourceInfo__submsgs[0], &google_api_expr_v1alpha1_SourceInfo__fields[0], UPB_SIZE(40, 72), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0, #ifdef UPB_TRACING_ENABLED @@ -367,7 +367,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo_msg_init = { }; const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_Extension_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_Extension__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__SourceInfo__Extension__Version_msg_init_ptr}, }; @@ -378,7 +378,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_Extension__f }; const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__Extension_msg_init = { - &google_api_expr_v1alpha1_SourceInfo_Extension_submsgs[0], + &google_api_expr_v1alpha1_SourceInfo_Extension__submsgs[0], &google_api_expr_v1alpha1_SourceInfo_Extension__fields[0], UPB_SIZE(32, 48), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0, #ifdef UPB_TRACING_ENABLED @@ -435,7 +435,7 @@ const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_ }; const upb_MiniTable* google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init_ptr = &google__api__expr__v1alpha1__SourceInfo__PositionsEntry_msg_init; -static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__Expr_msg_init_ptr}, }; @@ -445,7 +445,7 @@ static const upb_MiniTableField google_api_expr_v1alpha1_SourceInfo_MacroCallsEn }; const upb_MiniTable google__api__expr__v1alpha1__SourceInfo__MacroCallsEntry_msg_init = { - &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h index 42ea213208..ec8b6455e9 100644 --- a/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/expr/v1alpha1/syntax.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -59,4 +59,4 @@ extern const upb_MiniTableFile google_api_expr_v1alpha1_syntax_proto_upb_file_la #include "upb/port/undef.inc" -#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 594336aac3..206e8c39d8 100644 --- a/src/core/ext/upb-gen/google/api/http.upb.h +++ b/src/core/ext/upb-gen/google/api/http.upb.h @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_HTTP_PROTO_UPB_H_ -#define GOOGLE_API_HTTP_PROTO_UPB_H_ +#ifndef GOOGLE_API_HTTP_PROTO_UPB_H__UPB_H_ +#define GOOGLE_API_HTTP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "google/api/http.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -520,4 +521,4 @@ UPB_INLINE void google_api_CustomHttpPattern_set_path(google_api_CustomHttpPatte #include "upb/port/undef.inc" -#endif /* GOOGLE_API_HTTP_PROTO_UPB_H_ */ +#endif /* GOOGLE_API_HTTP_PROTO_UPB_H__UPB_H_ */ 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 7c56734b00..b4713538bf 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 @@ -14,7 +14,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_api_Http_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_Http__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init_ptr}, }; @@ -24,7 +24,7 @@ static const upb_MiniTableField google_api_Http__fields[2] = { }; const upb_MiniTable google__api__Http_msg_init = { - &google_api_Http_submsgs[0], + &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 @@ -39,7 +39,7 @@ const upb_MiniTable google__api__Http_msg_init = { }; const upb_MiniTable* google__api__Http_msg_init_ptr = &google__api__Http_msg_init; -static const upb_MiniTableSubInternal google_api_HttpRule_submsgs[2] = { +static const upb_MiniTableSubInternal google_api_HttpRule__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__CustomHttpPattern_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__HttpRule_msg_init_ptr}, }; @@ -58,7 +58,7 @@ static const upb_MiniTableField google_api_HttpRule__fields[10] = { }; const upb_MiniTable google__api__HttpRule_msg_init = { - &google_api_HttpRule_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/google/api/http.upb_minitable.h b/src/core/ext/upb-gen/google/api/http.upb_minitable.h index 3df86fbdd9..425f1e8e76 100644 --- a/src/core/ext/upb-gen/google/api/http.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/http.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_API_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_API_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile google_api_http_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_API_HTTP_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_API_HTTP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 a3b257a7c9..0b90cb7166 100644 --- a/src/core/ext/upb-gen/google/api/httpbody.upb.h +++ b/src/core/ext/upb-gen/google/api/httpbody.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H_ -#define GOOGLE_API_HTTPBODY_PROTO_UPB_H_ +#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_H_ +#define GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -170,4 +170,4 @@ UPB_INLINE struct google_protobuf_Any* google_api_HttpBody_add_extensions(google #include "upb/port/undef.inc" -#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_H_ */ +#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_H_ */ 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 e30cbbcd47..6ec907dc2b 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 @@ -15,7 +15,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_api_HttpBody_submsgs[1] = { +static const upb_MiniTableSubInternal google_api_HttpBody__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField google_api_HttpBody__fields[3] = { }; const upb_MiniTable google__api__HttpBody_msg_init = { - &google_api_HttpBody_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h index abd05f43c5..01f1f61d29 100644 --- a/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h +++ b/src/core/ext/upb-gen/google/api/httpbody.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_api_httpbody_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c41272123a..39832c3f4f 100644 --- a/src/core/ext/upb-gen/google/protobuf/any.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/any.upb.h @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "google/protobuf/any.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -100,4 +101,4 @@ UPB_INLINE void google_protobuf_Any_set_value(google_protobuf_Any *msg, upb_Stri #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h index 77fecd2617..26fad8894b 100644 --- a/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_protobuf_any_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 af260e7acf..736f42fe5a 100644 --- a/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/descriptor.upb.h @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "google/protobuf/descriptor.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -6893,4 +6894,4 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_H_ */ 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 08fa451f75..f641f657d6 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 @@ -14,7 +14,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorSet__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FileDescriptorProto_msg_init_ptr}, }; @@ -23,9 +23,9 @@ static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = { }; const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { - &google_protobuf_FileDescriptorSet_submsgs[0], + &google_protobuf_FileDescriptorSet__submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], - 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, + 16, 1, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED "google.protobuf.FileDescriptorSet", #endif @@ -36,14 +36,14 @@ const upb_MiniTable google__protobuf__FileDescriptorSet_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorSet_msg_init_ptr = &google__protobuf__FileDescriptorSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto_submsgs[7] = { +static const upb_MiniTableSubInternal google_protobuf_FileDescriptorProto__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FileOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = { @@ -63,7 +63,7 @@ static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] }; const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { - &google_protobuf_FileDescriptorProto_submsgs[0], + &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 @@ -90,7 +90,7 @@ const upb_MiniTable google__protobuf__FileDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FileDescriptorProto_msg_init_ptr = &google__protobuf__FileDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__DescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto_msg_init_ptr}, @@ -115,7 +115,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = { }; const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { - &google_protobuf_DescriptorProto_submsgs[0], + &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 @@ -142,7 +142,7 @@ const upb_MiniTable google__protobuf__DescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__DescriptorProto_msg_init_ptr = &google__protobuf__DescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_DescriptorProto_ExtensionRange__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions_msg_init_ptr}, }; @@ -153,7 +153,7 @@ static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__ }; const upb_MiniTable google__protobuf__DescriptorProto__ExtensionRange_msg_init = { - &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], + &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 @@ -177,11 +177,11 @@ const upb_MiniTable google__protobuf__DescriptorProto__ReservedRange_msg_init = }; const upb_MiniTable* google__protobuf__DescriptorProto__ReservedRange_msg_init_ptr = &google__protobuf__DescriptorProto__ReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions_submsgs[4] = { +static const upb_MiniTableSubInternal google_protobuf_ExtensionRangeOptions__submsgs[4] = { {.UPB_PRIVATE(submsg) = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init}, }; static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] = { @@ -192,7 +192,7 @@ static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[4] }; const upb_MiniTable google__protobuf__ExtensionRangeOptions_msg_init = { - &google_protobuf_ExtensionRangeOptions_submsgs[0], + &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 @@ -253,10 +253,10 @@ const upb_MiniTable google__protobuf__ExtensionRangeOptions__Declaration_msg_ini }; const upb_MiniTable* google__protobuf__ExtensionRangeOptions__Declaration_msg_init_ptr = &google__protobuf__ExtensionRangeOptions__Declaration_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FieldDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Label_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldDescriptorProto_Type_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Label_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldDescriptorProto__Type_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = { @@ -274,7 +274,7 @@ static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] }; const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { - &google_protobuf_FieldDescriptorProto_submsgs[0], + &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 @@ -283,7 +283,7 @@ const upb_MiniTable google__protobuf__FieldDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__FieldDescriptorProto_msg_init_ptr = &google__protobuf__FieldDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_OneofDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__OneofOptions_msg_init_ptr}, }; @@ -293,7 +293,7 @@ static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] }; const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { - &google_protobuf_OneofDescriptorProto_submsgs[0], + &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 @@ -302,7 +302,7 @@ const upb_MiniTable google__protobuf__OneofDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__OneofDescriptorProto_msg_init_ptr = &google__protobuf__OneofDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumDescriptorProto__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumOptions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr}, @@ -317,7 +317,7 @@ static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = }; const upb_MiniTable google__protobuf__EnumDescriptorProto_msg_init = { - &google_protobuf_EnumDescriptorProto_submsgs[0], + &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 @@ -351,7 +351,7 @@ const upb_MiniTable google__protobuf__EnumDescriptorProto__EnumReservedRange_msg }; const upb_MiniTable* google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init_ptr = &google__protobuf__EnumDescriptorProto__EnumReservedRange_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__EnumValueOptions_msg_init_ptr}, }; @@ -362,7 +362,7 @@ static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields }; const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { - &google_protobuf_EnumValueDescriptorProto_submsgs[0], + &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 @@ -371,7 +371,7 @@ const upb_MiniTable google__protobuf__EnumValueDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueDescriptorProto_msg_init_ptr = &google__protobuf__EnumValueDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceDescriptorProto__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodDescriptorProto_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ServiceOptions_msg_init_ptr}, }; @@ -383,7 +383,7 @@ static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3 }; const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { - &google_protobuf_ServiceDescriptorProto_submsgs[0], + &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 @@ -398,7 +398,7 @@ const upb_MiniTable google__protobuf__ServiceDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceDescriptorProto_msg_init_ptr = &google__protobuf__ServiceDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_MethodDescriptorProto__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__MethodOptions_msg_init_ptr}, }; @@ -412,7 +412,7 @@ static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] }; const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { - &google_protobuf_MethodDescriptorProto_submsgs[0], + &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 @@ -421,10 +421,10 @@ const upb_MiniTable google__protobuf__MethodDescriptorProto_msg_init = { }; const upb_MiniTable* google__protobuf__MethodDescriptorProto_msg_init_ptr = &google__protobuf__MethodDescriptorProto_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FileOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FileOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FileOptions_OptimizeMode_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FileOptions__OptimizeMode_enum_init}, }; static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { @@ -452,7 +452,7 @@ static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = { }; const upb_MiniTable google__protobuf__FileOptions_msg_init = { - &google_protobuf_FileOptions_submsgs[0], + &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 @@ -495,7 +495,7 @@ const upb_MiniTable google__protobuf__FileOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FileOptions_msg_init_ptr = &google__protobuf__FileOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MessageOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_MessageOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -511,7 +511,7 @@ static const upb_MiniTableField google_protobuf_MessageOptions__fields[7] = { }; const upb_MiniTable google__protobuf__MessageOptions_msg_init = { - &google_protobuf_MessageOptions_submsgs[0], + &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 @@ -554,15 +554,15 @@ const upb_MiniTable google__protobuf__MessageOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MessageOptions_msg_init_ptr = &google__protobuf__MessageOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_submsgs[8] = { +static const upb_MiniTableSubInternal google_protobuf_FieldOptions__submsgs[8] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__EditionDefault_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_CType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_JSType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionRetention_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FieldOptions_OptionTargetType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__CType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__JSType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionRetention_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FieldOptions__OptionTargetType_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { @@ -583,7 +583,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions__fields[14] = { }; const upb_MiniTable google__protobuf__FieldOptions_msg_init = { - &google_protobuf_FieldOptions_submsgs[0], + &google_protobuf_FieldOptions__submsgs[0], &google_protobuf_FieldOptions__fields[0], UPB_SIZE(56, 72), 14, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -626,8 +626,8 @@ const upb_MiniTable google__protobuf__FieldOptions_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions_msg_init_ptr = &google__protobuf__FieldOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FieldOptions_EditionDefault__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fields[2] = { @@ -636,7 +636,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_EditionDefault__fie }; const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { - &google_protobuf_FieldOptions_EditionDefault_submsgs[0], + &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 @@ -645,10 +645,10 @@ const upb_MiniTable google__protobuf__FieldOptions__EditionDefault_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__EditionDefault_msg_init_ptr = &google__protobuf__FieldOptions__EditionDefault_msg_init; -static const upb_MiniTableSubInternal 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_MiniTableSubInternal 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] = { @@ -659,7 +659,7 @@ static const upb_MiniTableField google_protobuf_FieldOptions_FeatureSupport__fie }; const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { - &google_protobuf_FieldOptions_FeatureSupport_submsgs[0], + &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 @@ -668,7 +668,7 @@ const upb_MiniTable google__protobuf__FieldOptions__FeatureSupport_msg_init = { }; const upb_MiniTable* google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr = &google__protobuf__FieldOptions__FeatureSupport_msg_init; -static const upb_MiniTableSubInternal google_protobuf_OneofOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_OneofOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -679,7 +679,7 @@ static const upb_MiniTableField google_protobuf_OneofOptions__fields[2] = { }; const upb_MiniTable google__protobuf__OneofOptions_msg_init = { - &google_protobuf_OneofOptions_submsgs[0], + &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 @@ -722,7 +722,7 @@ const upb_MiniTable google__protobuf__OneofOptions_msg_init = { }; const upb_MiniTable* google__protobuf__OneofOptions_msg_init_ptr = &google__protobuf__OneofOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_EnumOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -736,7 +736,7 @@ static const upb_MiniTableField google_protobuf_EnumOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumOptions_msg_init = { - &google_protobuf_EnumOptions_submsgs[0], + &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 @@ -779,7 +779,7 @@ const upb_MiniTable google__protobuf__EnumOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumOptions_msg_init_ptr = &google__protobuf__EnumOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_EnumValueOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FieldOptions__FeatureSupport_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, @@ -794,7 +794,7 @@ static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[5] = { }; const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { - &google_protobuf_EnumValueOptions_submsgs[0], + &google_protobuf_EnumValueOptions__submsgs[0], &google_protobuf_EnumValueOptions__fields[0], UPB_SIZE(32, 40), 5, kUpb_ExtMode_Extendable, 4, UPB_FASTTABLE_MASK(248), 0, #ifdef UPB_TRACING_ENABLED @@ -837,7 +837,7 @@ const upb_MiniTable google__protobuf__EnumValueOptions_msg_init = { }; const upb_MiniTable* google__protobuf__EnumValueOptions_msg_init_ptr = &google__protobuf__EnumValueOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ServiceOptions_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_ServiceOptions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, }; @@ -849,7 +849,7 @@ static const upb_MiniTableField google_protobuf_ServiceOptions__fields[3] = { }; const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { - &google_protobuf_ServiceOptions_submsgs[0], + &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 @@ -892,10 +892,10 @@ const upb_MiniTable google__protobuf__ServiceOptions_msg_init = { }; const upb_MiniTable* google__protobuf__ServiceOptions_msg_init_ptr = &google__protobuf__ServiceOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_MethodOptions_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_MethodOptions__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__MethodOptions__IdempotencyLevel_enum_init}, }; static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { @@ -906,7 +906,7 @@ static const upb_MiniTableField google_protobuf_MethodOptions__fields[4] = { }; const upb_MiniTable google__protobuf__MethodOptions_msg_init = { - &google_protobuf_MethodOptions_submsgs[0], + &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 @@ -949,7 +949,7 @@ const upb_MiniTable google__protobuf__MethodOptions_msg_init = { }; const upb_MiniTable* google__protobuf__MethodOptions_msg_init_ptr = &google__protobuf__MethodOptions_msg_init; -static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_UninterpretedOption__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UninterpretedOption__NamePart_msg_init_ptr}, }; @@ -964,7 +964,7 @@ static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = }; const upb_MiniTable google__protobuf__UninterpretedOption_msg_init = { - &google_protobuf_UninterpretedOption_submsgs[0], + &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 @@ -994,13 +994,13 @@ const upb_MiniTable google__protobuf__UninterpretedOption__NamePart_msg_init = { }; const upb_MiniTable* google__protobuf__UninterpretedOption__NamePart_msg_init_ptr = &google__protobuf__UninterpretedOption__NamePart_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSet_submsgs[6] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_FieldPresence_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_EnumType_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_Utf8Validation_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_MessageEncoding_enum_init}, - {.UPB_PRIVATE(subenum) = &google_protobuf_FeatureSet_JsonFormat_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_FeatureSet__submsgs[6] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__FieldPresence_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__EnumType_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__Utf8Validation_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__MessageEncoding_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__FeatureSet__JsonFormat_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { @@ -1013,7 +1013,7 @@ static const upb_MiniTableField google_protobuf_FeatureSet__fields[6] = { }; const upb_MiniTable google__protobuf__FeatureSet_msg_init = { - &google_protobuf_FeatureSet_submsgs[0], + &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 @@ -1022,10 +1022,10 @@ const upb_MiniTable google__protobuf__FeatureSet_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSet_msg_init_ptr = &google__protobuf__FeatureSet_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, - {.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_FeatureSetDefaults__fields[3] = { @@ -1035,7 +1035,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults__fields[3] = }; const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { - &google_protobuf_FeatureSetDefaults_submsgs[0], + &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 @@ -1048,10 +1048,10 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults_msg_init = { }; const upb_MiniTable* google__protobuf__FeatureSetDefaults_msg_init_ptr = &google__protobuf__FeatureSetDefaults_msg_init; -static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[3] = { +static const upb_MiniTableSubInternal google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[3] = { {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__FeatureSet_msg_init_ptr}, - {.UPB_PRIVATE(subenum) = &google_protobuf_Edition_enum_init}, + {.UPB_PRIVATE(subenum) = &google__protobuf__Edition_enum_init}, }; static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[3] = { @@ -1061,7 +1061,7 @@ static const upb_MiniTableField google_protobuf_FeatureSetDefaults_FeatureSetEdi }; const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init = { - &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault_submsgs[0], + &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__submsgs[0], &google_protobuf_FeatureSetDefaults_FeatureSetEditionDefault__fields[0], UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -1070,7 +1070,7 @@ const upb_MiniTable google__protobuf__FeatureSetDefaults__FeatureSetEditionDefau }; const upb_MiniTable* google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init_ptr = &google__protobuf__FeatureSetDefaults__FeatureSetEditionDefault_msg_init; -static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_SourceCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__SourceCodeInfo__Location_msg_init_ptr}, }; @@ -1079,9 +1079,9 @@ static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__SourceCodeInfo_msg_init = { - &google_protobuf_SourceCodeInfo_submsgs[0], + &google_protobuf_SourceCodeInfo__submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], - 16, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0, + 16, 1, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(8), 0, #ifdef UPB_TRACING_ENABLED "google.protobuf.SourceCodeInfo", #endif @@ -1120,7 +1120,7 @@ const upb_MiniTable google__protobuf__SourceCodeInfo__Location_msg_init = { }; const upb_MiniTable* google__protobuf__SourceCodeInfo__Location_msg_init_ptr = &google__protobuf__SourceCodeInfo__Location_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr}, }; @@ -1129,7 +1129,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = { }; const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { - &google_protobuf_GeneratedCodeInfo_submsgs[0], + &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 @@ -1142,8 +1142,8 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr = &google__protobuf__GeneratedCodeInfo_msg_init; -static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init}, +static const upb_MiniTableSubInternal google_protobuf_GeneratedCodeInfo_Annotation__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init}, }; static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = { @@ -1155,7 +1155,7 @@ static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fi }; const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { - &google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0], + &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 @@ -1168,7 +1168,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = { }; const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init; -const upb_MiniTableEnum google_protobuf_Edition_enum_init = { +const upb_MiniTableEnum google__protobuf__Edition_enum_init = { 64, 9, { @@ -1186,7 +1186,7 @@ const upb_MiniTableEnum google_protobuf_Edition_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = { +const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init = { 64, 0, { @@ -1195,7 +1195,7 @@ const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_ }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init = { 64, 0, { @@ -1204,7 +1204,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init = { 64, 0, { @@ -1213,7 +1213,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init = { 64, 0, { @@ -1222,7 +1222,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init = { 64, 0, { @@ -1231,7 +1231,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init = { 64, 0, { @@ -1240,7 +1240,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_in }, }; -const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { +const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init = { 64, 0, { @@ -1249,7 +1249,7 @@ const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init = { 64, 0, { @@ -1258,7 +1258,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init = { 64, 0, { @@ -1267,7 +1267,7 @@ const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init = { 64, 0, { @@ -1276,7 +1276,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init = { 64, 0, { @@ -1285,7 +1285,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init = { 64, 0, { @@ -1294,7 +1294,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = }, }; -const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = { +const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init = { 64, 0, { @@ -1303,7 +1303,7 @@ const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init }, }; -const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { +const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init = { 64, 0, { @@ -1312,7 +1312,7 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = { }, }; -const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = { +const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init = { 64, 0, { @@ -1321,7 +1321,7 @@ const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_en }, }; -const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = { +const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init = { 64, 0, { @@ -1367,23 +1367,23 @@ static const upb_MiniTable *messages_layout[33] = { }; static const upb_MiniTableEnum *enums_layout[17] = { - &google_protobuf_Edition_enum_init, - &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init, - &google_protobuf_FeatureSet_EnumType_enum_init, - &google_protobuf_FeatureSet_FieldPresence_enum_init, - &google_protobuf_FeatureSet_JsonFormat_enum_init, - &google_protobuf_FeatureSet_MessageEncoding_enum_init, - &google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init, - &google_protobuf_FeatureSet_Utf8Validation_enum_init, - &google_protobuf_FieldDescriptorProto_Label_enum_init, - &google_protobuf_FieldDescriptorProto_Type_enum_init, - &google_protobuf_FieldOptions_CType_enum_init, - &google_protobuf_FieldOptions_JSType_enum_init, - &google_protobuf_FieldOptions_OptionRetention_enum_init, - &google_protobuf_FieldOptions_OptionTargetType_enum_init, - &google_protobuf_FileOptions_OptimizeMode_enum_init, - &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init, - &google_protobuf_MethodOptions_IdempotencyLevel_enum_init, + &google__protobuf__Edition_enum_init, + &google__protobuf__ExtensionRangeOptions__VerificationState_enum_init, + &google__protobuf__FeatureSet__EnumType_enum_init, + &google__protobuf__FeatureSet__FieldPresence_enum_init, + &google__protobuf__FeatureSet__JsonFormat_enum_init, + &google__protobuf__FeatureSet__MessageEncoding_enum_init, + &google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init, + &google__protobuf__FeatureSet__Utf8Validation_enum_init, + &google__protobuf__FieldDescriptorProto__Label_enum_init, + &google__protobuf__FieldDescriptorProto__Type_enum_init, + &google__protobuf__FieldOptions__CType_enum_init, + &google__protobuf__FieldOptions__JSType_enum_init, + &google__protobuf__FieldOptions__OptionRetention_enum_init, + &google__protobuf__FieldOptions__OptionTargetType_enum_init, + &google__protobuf__FileOptions__OptimizeMode_enum_init, + &google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init, + &google__protobuf__MethodOptions__IdempotencyLevel_enum_init, }; const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { 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 6cb83ecedc..1dea594faf 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -85,23 +85,23 @@ extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo_msg_init_ptr; extern const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init; extern const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr; -extern const upb_MiniTableEnum google_protobuf_Edition_enum_init; -extern const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_EnumType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_FieldPresence_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_JsonFormat_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_MessageEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_RepeatedFieldEncoding_enum_init; -extern const upb_MiniTableEnum google_protobuf_FeatureSet_Utf8Validation_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init; -extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init; -extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init; -extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init; -extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init; +extern const upb_MiniTableEnum google__protobuf__Edition_enum_init; +extern const upb_MiniTableEnum google__protobuf__ExtensionRangeOptions__VerificationState_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__EnumType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__FieldPresence_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__JsonFormat_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__MessageEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__RepeatedFieldEncoding_enum_init; +extern const upb_MiniTableEnum google__protobuf__FeatureSet__Utf8Validation_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Label_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldDescriptorProto__Type_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__CType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__JSType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionRetention_enum_init; +extern const upb_MiniTableEnum google__protobuf__FieldOptions__OptionTargetType_enum_init; +extern const upb_MiniTableEnum google__protobuf__FileOptions__OptimizeMode_enum_init; +extern const upb_MiniTableEnum google__protobuf__GeneratedCodeInfo__Annotation__Semantic_enum_init; +extern const upb_MiniTableEnum google__protobuf__MethodOptions__IdempotencyLevel_enum_init; extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #ifdef __cplusplus @@ -110,4 +110,4 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 5e00870776..833d1e43f8 100644 --- a/src/core/ext/upb-gen/google/protobuf/duration.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/duration.upb.h @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "google/protobuf/duration.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -100,4 +101,4 @@ UPB_INLINE void google_protobuf_Duration_set_nanos(google_protobuf_Duration *msg #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h index c42e329b8c..71b9969167 100644 --- a/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/duration.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_protobuf_duration_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb.h b/src/core/ext/upb-gen/google/protobuf/empty.upb.h index 04b07d5fbe..74a5742abe 100644 --- a/src/core/ext/upb-gen/google/protobuf/empty.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/empty.upb.h @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "google/protobuf/empty.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -68,4 +69,4 @@ UPB_INLINE char* google_protobuf_Empty_serialize_ex(const google_protobuf_Empty* #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h index d8fbbf178b..91c08190fd 100644 --- a/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/empty.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_protobuf_empty_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 3db6323079..d489dd53e4 100644 --- a/src/core/ext/upb-gen/google/protobuf/struct.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/struct.upb.h @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "google/protobuf/struct.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -459,4 +460,4 @@ UPB_INLINE struct google_protobuf_Value* google_protobuf_ListValue_add_values(go #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_H_ */ 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 73f4fcb849..27b277cd2a 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 @@ -14,7 +14,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_protobuf_Struct_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_Struct__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct__FieldsEntry_msg_init_ptr}, }; @@ -23,7 +23,7 @@ static const upb_MiniTableField google_protobuf_Struct__fields[1] = { }; const upb_MiniTable google__protobuf__Struct_msg_init = { - &google_protobuf_Struct_submsgs[0], + &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 @@ -32,7 +32,7 @@ const upb_MiniTable google__protobuf__Struct_msg_init = { }; const upb_MiniTable* google__protobuf__Struct_msg_init_ptr = &google__protobuf__Struct_msg_init; -static const upb_MiniTableSubInternal google_protobuf_Struct_FieldsEntry_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_Struct_FieldsEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Value_msg_init_ptr}, }; @@ -42,7 +42,7 @@ static const upb_MiniTableField google_protobuf_Struct_FieldsEntry__fields[2] = }; const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init = { - &google_protobuf_Struct_FieldsEntry_submsgs[0], + &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 @@ -55,7 +55,7 @@ const upb_MiniTable google__protobuf__Struct__FieldsEntry_msg_init = { }; const upb_MiniTable* google__protobuf__Struct__FieldsEntry_msg_init_ptr = &google__protobuf__Struct__FieldsEntry_msg_init; -static const upb_MiniTableSubInternal google_protobuf_Value_submsgs[2] = { +static const upb_MiniTableSubInternal google_protobuf_Value__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__ListValue_msg_init_ptr}, }; @@ -70,7 +70,7 @@ static const upb_MiniTableField google_protobuf_Value__fields[6] = { }; const upb_MiniTable google__protobuf__Value_msg_init = { - &google_protobuf_Value_submsgs[0], + &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 @@ -89,7 +89,7 @@ const upb_MiniTable google__protobuf__Value_msg_init = { }; const upb_MiniTable* google__protobuf__Value_msg_init_ptr = &google__protobuf__Value_msg_init; -static const upb_MiniTableSubInternal google_protobuf_ListValue_submsgs[1] = { +static const upb_MiniTableSubInternal google_protobuf_ListValue__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Value_msg_init_ptr}, }; @@ -98,7 +98,7 @@ static const upb_MiniTableField google_protobuf_ListValue__fields[1] = { }; const upb_MiniTable google__protobuf__ListValue_msg_init = { - &google_protobuf_ListValue_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h index 36250455eb..d2daacbb21 100644 --- a/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/struct.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile google_protobuf_struct_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 9a60829884..0be35d0f10 100644 --- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb.h @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "google/protobuf/timestamp.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -100,4 +101,4 @@ UPB_INLINE void google_protobuf_Timestamp_set_nanos(google_protobuf_Timestamp *m #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h index cf8d215353..d3dbafc218 100644 --- a/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/timestamp.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_protobuf_timestamp_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 3c2e586c39..202196ca49 100644 --- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h +++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb.h @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_ -#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_ +#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_H_ +#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "google/protobuf/wrappers.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -524,4 +525,4 @@ UPB_INLINE void google_protobuf_BytesValue_set_value(google_protobuf_BytesValue #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H_ */ +#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h index ec2393e765..50dfd9c1d1 100644 --- a/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h +++ b/src/core/ext/upb-gen/google/protobuf/wrappers.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -45,4 +45,4 @@ extern const upb_MiniTableFile google_protobuf_wrappers_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c2dcbbb914..6eaed09fbf 100644 --- a/src/core/ext/upb-gen/google/rpc/status.upb.h +++ b/src/core/ext/upb-gen/google/rpc/status.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H_ -#define GOOGLE_RPC_STATUS_PROTO_UPB_H_ +#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_H_ +#define GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -170,4 +170,4 @@ UPB_INLINE struct google_protobuf_Any* google_rpc_Status_add_details(google_rpc_ #include "upb/port/undef.inc" -#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_H_ */ +#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_H_ */ 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 120c6efd79..97569391a0 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 @@ -15,7 +15,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal google_rpc_Status_submsgs[1] = { +static const upb_MiniTableSubInternal google_rpc_Status__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField google_rpc_Status__fields[3] = { }; const upb_MiniTable google__rpc__Status_msg_init = { - &google_rpc_Status_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h index c9ef7fabab..94a67935c1 100644 --- a/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h +++ b/src/core/ext/upb-gen/google/rpc/status.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_ -#define GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_ +#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile google_rpc_status_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_MINITABLE_H_ */ +#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 3c91e2f510..2893dfcc32 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 @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_ -#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_ +#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_H_ +#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "opencensus/proto/trace/v1/trace_config.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -404,4 +405,4 @@ UPB_INLINE void opencensus_proto_trace_v1_RateLimitingSampler_set_qps(opencensus #include "upb/port/undef.inc" -#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H_ */ +#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_H_ */ 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 3b3d303cea..83b8c03e84 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 @@ -14,7 +14,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal opencensus_proto_trace_v1_TraceConfig_submsgs[3] = { +static const upb_MiniTableSubInternal opencensus_proto_trace_v1_TraceConfig__submsgs[3] = { {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__ProbabilitySampler_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__ConstantSampler_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &opencensus__proto__trace__v1__RateLimitingSampler_msg_init_ptr}, @@ -31,7 +31,7 @@ static const upb_MiniTableField opencensus_proto_trace_v1_TraceConfig__fields[7] }; const upb_MiniTable opencensus__proto__trace__v1__TraceConfig_msg_init = { - &opencensus_proto_trace_v1_TraceConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h index 8e60a1cdbe..69ffca599a 100644 --- a/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h +++ b/src/core/ext/upb-gen/opencensus/proto/trace/v1/trace_config.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_ -#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_ +#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile opencensus_proto_trace_v1_trace_config_proto_upb_ #include "upb/port/undef.inc" -#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_MINITABLE_H_ */ +#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 0ada618921..9ce9704e0c 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_ -#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_ +#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_H_ +#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -259,4 +259,4 @@ UPB_INLINE void grpc_gcp_AltsContext_PeerAttributesEntry_set_value(grpc_gcp_Alts #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H_ */ +#endif /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_H_ */ 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 16e44fdd39..9fdd5fc1f7 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 @@ -15,7 +15,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal grpc_gcp_AltsContext_submsgs[2] = { +static const upb_MiniTableSubInternal grpc_gcp_AltsContext__submsgs[2] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__AltsContext__PeerAttributesEntry_msg_init_ptr}, }; @@ -31,7 +31,7 @@ static const upb_MiniTableField grpc_gcp_AltsContext__fields[7] = { }; const upb_MiniTable grpc__gcp__AltsContext_msg_init = { - &grpc_gcp_AltsContext_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h index 67da05b424..5284f20fa8 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_ -#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_ +#ifndef SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile src_proto_grpc_gcp_altscontext_proto_upb_file_lay #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_MINITABLE_H_ */ +#endif /* SRC_PROTO_GRPC_GCP_ALTSCONTEXT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 43d5aef231..9d3e7836f7 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_ -#define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_ +#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_H_ +#define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1773,4 +1773,4 @@ UPB_INLINE struct grpc_gcp_HandshakerStatus* grpc_gcp_HandshakerResp_mutable_sta #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H_ */ +#endif /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_H_ */ 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 634ea9bbf6..86dd0fc1be 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 @@ -37,7 +37,7 @@ const upb_MiniTable grpc__gcp__Endpoint_msg_init = { }; const upb_MiniTable* grpc__gcp__Endpoint_msg_init_ptr = &grpc__gcp__Endpoint_msg_init; -static const upb_MiniTableSubInternal grpc_gcp_Identity_submsgs[1] = { +static const upb_MiniTableSubInternal grpc_gcp_Identity__submsgs[1] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity__AttributesEntry_msg_init_ptr}, }; @@ -48,7 +48,7 @@ static const upb_MiniTableField grpc_gcp_Identity__fields[3] = { }; const upb_MiniTable grpc__gcp__Identity_msg_init = { - &grpc_gcp_Identity_submsgs[0], + &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 @@ -84,7 +84,7 @@ const upb_MiniTable grpc__gcp__Identity__AttributesEntry_msg_init = { }; const upb_MiniTable* grpc__gcp__Identity__AttributesEntry_msg_init_ptr = &grpc__gcp__Identity__AttributesEntry_msg_init; -static const upb_MiniTableSubInternal grpc_gcp_StartClientHandshakeReq_submsgs[5] = { +static const upb_MiniTableSubInternal grpc_gcp_StartClientHandshakeReq__submsgs[5] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr}, @@ -106,7 +106,7 @@ static const upb_MiniTableField grpc_gcp_StartClientHandshakeReq__fields[10] = { }; const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = { - &grpc_gcp_StartClientHandshakeReq_submsgs[0], + &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 @@ -133,7 +133,7 @@ const upb_MiniTable grpc__gcp__StartClientHandshakeReq_msg_init = { }; const upb_MiniTable* grpc__gcp__StartClientHandshakeReq_msg_init_ptr = &grpc__gcp__StartClientHandshakeReq_msg_init; -static const upb_MiniTableSubInternal grpc_gcp_ServerHandshakeParameters_submsgs[1] = { +static const upb_MiniTableSubInternal grpc_gcp_ServerHandshakeParameters__submsgs[1] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, }; @@ -143,7 +143,7 @@ static const upb_MiniTableField grpc_gcp_ServerHandshakeParameters__fields[2] = }; const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = { - &grpc_gcp_ServerHandshakeParameters_submsgs[0], + &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 @@ -158,7 +158,7 @@ const upb_MiniTable grpc__gcp__ServerHandshakeParameters_msg_init = { }; const upb_MiniTable* grpc__gcp__ServerHandshakeParameters_msg_init_ptr = &grpc__gcp__ServerHandshakeParameters_msg_init; -static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq_submsgs[4] = { +static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq__submsgs[4] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__Endpoint_msg_init_ptr}, @@ -176,7 +176,7 @@ static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq__fields[7] = { }; const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = { - &grpc_gcp_StartServerHandshakeReq_submsgs[0], + &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 @@ -195,7 +195,7 @@ const upb_MiniTable grpc__gcp__StartServerHandshakeReq_msg_init = { }; const upb_MiniTable* grpc__gcp__StartServerHandshakeReq_msg_init_ptr = &grpc__gcp__StartServerHandshakeReq_msg_init; -static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[1] = { +static const upb_MiniTableSubInternal grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__ServerHandshakeParameters_msg_init_ptr}, }; @@ -205,7 +205,7 @@ static const upb_MiniTableField grpc_gcp_StartServerHandshakeReq_HandshakeParame }; const upb_MiniTable grpc__gcp__StartServerHandshakeReq__HandshakeParametersEntry_msg_init = { - &grpc_gcp_StartServerHandshakeReq_HandshakeParametersEntry_submsgs[0], + &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 @@ -236,7 +236,7 @@ const upb_MiniTable grpc__gcp__NextHandshakeMessageReq_msg_init = { }; const upb_MiniTable* grpc__gcp__NextHandshakeMessageReq_msg_init_ptr = &grpc__gcp__NextHandshakeMessageReq_msg_init; -static const upb_MiniTableSubInternal grpc_gcp_HandshakerReq_submsgs[3] = { +static const upb_MiniTableSubInternal grpc_gcp_HandshakerReq__submsgs[3] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__StartClientHandshakeReq_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__StartServerHandshakeReq_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__NextHandshakeMessageReq_msg_init_ptr}, @@ -249,7 +249,7 @@ static const upb_MiniTableField grpc_gcp_HandshakerReq__fields[3] = { }; const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = { - &grpc_gcp_HandshakerReq_submsgs[0], + &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 @@ -264,7 +264,7 @@ const upb_MiniTable grpc__gcp__HandshakerReq_msg_init = { }; const upb_MiniTable* grpc__gcp__HandshakerReq_msg_init_ptr = &grpc__gcp__HandshakerReq_msg_init; -static const upb_MiniTableSubInternal grpc_gcp_HandshakerResult_submsgs[3] = { +static const upb_MiniTableSubInternal grpc_gcp_HandshakerResult__submsgs[3] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__Identity_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions_msg_init_ptr}, @@ -282,7 +282,7 @@ static const upb_MiniTableField grpc_gcp_HandshakerResult__fields[8] = { }; const upb_MiniTable grpc__gcp__HandshakerResult_msg_init = { - &grpc_gcp_HandshakerResult_submsgs[0], + &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 @@ -330,7 +330,7 @@ const upb_MiniTable grpc__gcp__HandshakerStatus_msg_init = { }; const upb_MiniTable* grpc__gcp__HandshakerStatus_msg_init_ptr = &grpc__gcp__HandshakerStatus_msg_init; -static const upb_MiniTableSubInternal grpc_gcp_HandshakerResp_submsgs[2] = { +static const upb_MiniTableSubInternal grpc_gcp_HandshakerResp__submsgs[2] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__HandshakerResult_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__HandshakerStatus_msg_init_ptr}, }; @@ -343,7 +343,7 @@ static const upb_MiniTableField grpc_gcp_HandshakerResp__fields[4] = { }; const upb_MiniTable grpc__gcp__HandshakerResp_msg_init = { - &grpc_gcp_HandshakerResp_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h index 6e566cef6a..7545440b1b 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_ -#define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_ +#ifndef SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -51,4 +51,4 @@ extern const upb_MiniTableFile src_proto_grpc_gcp_handshaker_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_MINITABLE_H_ */ +#endif /* SRC_PROTO_GRPC_GCP_HANDSHAKER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c99c6facfc..be7a0dd01b 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 @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_ -#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_ +#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_H_ +#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "src/proto/grpc/gcp/transport_security_common.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -205,4 +206,4 @@ UPB_INLINE void grpc_gcp_RpcProtocolVersions_Version_set_minor(grpc_gcp_RpcProto #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H_ */ +#endif /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_H_ */ 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 a4a93054fc..1b7f4c34e8 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 @@ -14,7 +14,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal grpc_gcp_RpcProtocolVersions_submsgs[2] = { +static const upb_MiniTableSubInternal grpc_gcp_RpcProtocolVersions__submsgs[2] = { {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__gcp__RpcProtocolVersions__Version_msg_init_ptr}, }; @@ -25,7 +25,7 @@ static const upb_MiniTableField grpc_gcp_RpcProtocolVersions__fields[2] = { }; const upb_MiniTable grpc__gcp__RpcProtocolVersions_msg_init = { - &grpc_gcp_RpcProtocolVersions_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h index 8526731aa0..ed3d40e2be 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_ -#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_ +#ifndef SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ +#define SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile src_proto_grpc_gcp_transport_security_common_prot #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_MINITABLE_H_ */ +#endif /* SRC_PROTO_GRPC_GCP_TRANSPORT_SECURITY_COMMON_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 3b6c12f8fa..8079c0b9e1 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 @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_ -#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_ +#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_H_ +#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "src/proto/grpc/health/v1/health.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -146,4 +147,4 @@ UPB_INLINE void grpc_health_v1_HealthCheckResponse_set_status(grpc_health_v1_Hea #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H_ */ +#endif /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h index ee52253c82..f359134f75 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/health/v1/health.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_ -#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_ +#ifndef SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_MINITABLE_H_ +#define SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile src_proto_grpc_health_v1_health_proto_upb_file_la #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_MINITABLE_H_ */ +#endif /* SRC_PROTO_GRPC_HEALTH_V1_HEALTH_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 6940e32cf7..3c6bb41911 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_ -#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_ +#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_H_ +#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -926,4 +926,4 @@ UPB_INLINE void grpc_lb_v1_Server_set_drop(grpc_lb_v1_Server *msg, bool value) { #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H_ */ +#endif /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_H_ */ 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 e24186525d..0a7008a9cf 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 @@ -16,7 +16,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceRequest_submsgs[2] = { +static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceRequest__submsgs[2] = { {.UPB_PRIVATE(submsg) = &grpc__lb__v1__InitialLoadBalanceRequest_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ClientStats_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField grpc_lb_v1_LoadBalanceRequest__fields[2] = { }; const upb_MiniTable grpc__lb__v1__LoadBalanceRequest_msg_init = { - &grpc_lb_v1_LoadBalanceRequest_submsgs[0], + &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 @@ -81,7 +81,7 @@ const upb_MiniTable grpc__lb__v1__ClientStatsPerToken_msg_init = { }; const upb_MiniTable* grpc__lb__v1__ClientStatsPerToken_msg_init_ptr = &grpc__lb__v1__ClientStatsPerToken_msg_init; -static const upb_MiniTableSubInternal grpc_lb_v1_ClientStats_submsgs[2] = { +static const upb_MiniTableSubInternal grpc_lb_v1_ClientStats__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ClientStatsPerToken_msg_init_ptr}, }; @@ -96,7 +96,7 @@ static const upb_MiniTableField grpc_lb_v1_ClientStats__fields[6] = { }; const upb_MiniTable grpc__lb__v1__ClientStats_msg_init = { - &grpc_lb_v1_ClientStats_submsgs[0], + &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 @@ -123,7 +123,7 @@ const upb_MiniTable grpc__lb__v1__ClientStats_msg_init = { }; const upb_MiniTable* grpc__lb__v1__ClientStats_msg_init_ptr = &grpc__lb__v1__ClientStats_msg_init; -static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceResponse_submsgs[3] = { +static const upb_MiniTableSubInternal grpc_lb_v1_LoadBalanceResponse__submsgs[3] = { {.UPB_PRIVATE(submsg) = &grpc__lb__v1__InitialLoadBalanceResponse_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lb__v1__ServerList_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lb__v1__FallbackResponse_msg_init_ptr}, @@ -136,7 +136,7 @@ static const upb_MiniTableField grpc_lb_v1_LoadBalanceResponse__fields[3] = { }; const upb_MiniTable grpc__lb__v1__LoadBalanceResponse_msg_init = { - &grpc_lb_v1_LoadBalanceResponse_submsgs[0], + &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 @@ -161,7 +161,7 @@ const upb_MiniTable grpc__lb__v1__FallbackResponse_msg_init = { }; const upb_MiniTable* grpc__lb__v1__FallbackResponse_msg_init_ptr = &grpc__lb__v1__FallbackResponse_msg_init; -static const upb_MiniTableSubInternal grpc_lb_v1_InitialLoadBalanceResponse_submsgs[1] = { +static const upb_MiniTableSubInternal grpc_lb_v1_InitialLoadBalanceResponse__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -170,7 +170,7 @@ static const upb_MiniTableField grpc_lb_v1_InitialLoadBalanceResponse__fields[1] }; const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init = { - &grpc_lb_v1_InitialLoadBalanceResponse_submsgs[0], + &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 @@ -179,7 +179,7 @@ const upb_MiniTable grpc__lb__v1__InitialLoadBalanceResponse_msg_init = { }; const upb_MiniTable* grpc__lb__v1__InitialLoadBalanceResponse_msg_init_ptr = &grpc__lb__v1__InitialLoadBalanceResponse_msg_init; -static const upb_MiniTableSubInternal grpc_lb_v1_ServerList_submsgs[1] = { +static const upb_MiniTableSubInternal grpc_lb_v1_ServerList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &grpc__lb__v1__Server_msg_init_ptr}, }; @@ -188,7 +188,7 @@ static const upb_MiniTableField grpc_lb_v1_ServerList__fields[1] = { }; const upb_MiniTable grpc__lb__v1__ServerList_msg_init = { - &grpc_lb_v1_ServerList_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h index 34a1b9accc..774c19f245 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lb/v1/load_balancer.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_ -#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_ +#ifndef SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -45,4 +45,4 @@ extern const upb_MiniTableFile src_proto_grpc_lb_v1_load_balancer_proto_upb_file #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_MINITABLE_H_ */ +#endif /* SRC_PROTO_GRPC_LB_V1_LOAD_BALANCER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 860d6d9ea3..494dd21344 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 @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_ -#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_ +#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_H_ +#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "src/proto/grpc/lookup/v1/rls.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -315,4 +316,4 @@ UPB_INLINE bool grpc_lookup_v1_RouteLookupResponse_add_targets(grpc_lookup_v1_Ro #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H_ */ +#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_H_ */ 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 5cf5c7798f..2cdc822f4e 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 @@ -14,7 +14,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupRequest_submsgs[1] = { +static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupRequest__submsgs[1] = { {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__RouteLookupRequest__KeyMapEntry_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField grpc_lookup_v1_RouteLookupRequest__fields[4] = { }; const upb_MiniTable grpc__lookup__v1__RouteLookupRequest_msg_init = { - &grpc_lookup_v1_RouteLookupRequest_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h index c2377276ef..64b4566375 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_ -#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_ +#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_MINITABLE_H_ */ +#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 b038b81d98..50c71ac24d 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_ -#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_ +#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_H_ +#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1413,4 +1413,4 @@ UPB_INLINE struct grpc_lookup_v1_RouteLookupConfig* grpc_lookup_v1_RouteLookupCl #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H_ */ +#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_H_ */ 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 fc297d25dc..f0905a3f99 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 @@ -37,7 +37,7 @@ const upb_MiniTable grpc__lookup__v1__NameMatcher_msg_init = { }; const upb_MiniTable* grpc__lookup__v1__NameMatcher_msg_init_ptr = &grpc__lookup__v1__NameMatcher_msg_init; -static const upb_MiniTableSubInternal grpc_lookup_v1_GrpcKeyBuilder_submsgs[4] = { +static const upb_MiniTableSubInternal grpc_lookup_v1_GrpcKeyBuilder__submsgs[4] = { {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__Name_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder__ExtraKeys_msg_init_ptr}, @@ -52,7 +52,7 @@ static const upb_MiniTableField grpc_lookup_v1_GrpcKeyBuilder__fields[4] = { }; const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder_msg_init = { - &grpc_lookup_v1_GrpcKeyBuilder_submsgs[0], + &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 @@ -131,7 +131,7 @@ const upb_MiniTable grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init }; const upb_MiniTable* grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init_ptr = &grpc__lookup__v1__GrpcKeyBuilder__ConstantKeysEntry_msg_init; -static const upb_MiniTableSubInternal grpc_lookup_v1_HttpKeyBuilder_submsgs[3] = { +static const upb_MiniTableSubInternal grpc_lookup_v1_HttpKeyBuilder__submsgs[3] = { {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__NameMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init_ptr}, @@ -146,7 +146,7 @@ static const upb_MiniTableField grpc_lookup_v1_HttpKeyBuilder__fields[5] = { }; const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder_msg_init = { - &grpc_lookup_v1_HttpKeyBuilder_submsgs[0], + &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 @@ -186,7 +186,7 @@ const upb_MiniTable grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init }; const upb_MiniTable* grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init_ptr = &grpc__lookup__v1__HttpKeyBuilder__ConstantKeysEntry_msg_init; -static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupConfig_submsgs[5] = { +static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupConfig__submsgs[5] = { {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__HttpKeyBuilder_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__GrpcKeyBuilder_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -207,7 +207,7 @@ static const upb_MiniTableField grpc_lookup_v1_RouteLookupConfig__fields[9] = { }; const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = { - &grpc_lookup_v1_RouteLookupConfig_submsgs[0], + &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 @@ -234,7 +234,7 @@ const upb_MiniTable grpc__lookup__v1__RouteLookupConfig_msg_init = { }; const upb_MiniTable* grpc__lookup__v1__RouteLookupConfig_msg_init_ptr = &grpc__lookup__v1__RouteLookupConfig_msg_init; -static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[1] = { +static const upb_MiniTableSubInternal grpc_lookup_v1_RouteLookupClusterSpecifier__submsgs[1] = { {.UPB_PRIVATE(submsg) = &grpc__lookup__v1__RouteLookupConfig_msg_init_ptr}, }; @@ -243,7 +243,7 @@ static const upb_MiniTableField grpc_lookup_v1_RouteLookupClusterSpecifier__fiel }; const upb_MiniTable grpc__lookup__v1__RouteLookupClusterSpecifier_msg_init = { - &grpc_lookup_v1_RouteLookupClusterSpecifier_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h index e9c96e79e9..e6f92d652e 100644 --- a/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h +++ b/src/core/ext/upb-gen/src/proto/grpc/lookup/v1/rls_config.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_ -#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_ +#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ +#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -45,4 +45,4 @@ extern const upb_MiniTableFile src_proto_grpc_lookup_v1_rls_config_proto_upb_fil #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_MINITABLE_H_ */ +#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 cbacca9367..626022d31d 100644 --- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ -#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ +#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_H_ +#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -221,7 +221,7 @@ UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_message_mi const upb_MiniTableExtension* ext = &udpa_annotations_message_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const udpa_annotations_MigrateAnnotation* default_val = NULL; const udpa_annotations_MigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -231,7 +231,7 @@ UPB_INLINE void udpa_annotations_set_message_migrate(struct google_protobuf_Mess const upb_MiniTableExtension* ext = &udpa_annotations_message_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -254,7 +254,7 @@ UPB_INLINE const udpa_annotations_FieldMigrateAnnotation* udpa_annotations_field const upb_MiniTableExtension* ext = &udpa_annotations_field_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const udpa_annotations_FieldMigrateAnnotation* default_val = NULL; const udpa_annotations_FieldMigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -264,7 +264,7 @@ UPB_INLINE void udpa_annotations_set_field_migrate(struct google_protobuf_FieldO const upb_MiniTableExtension* ext = &udpa_annotations_field_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -287,7 +287,7 @@ UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_enum_migra const upb_MiniTableExtension* ext = &udpa_annotations_enum_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const udpa_annotations_MigrateAnnotation* default_val = NULL; const udpa_annotations_MigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -297,7 +297,7 @@ UPB_INLINE void udpa_annotations_set_enum_migrate(struct google_protobuf_EnumOpt const upb_MiniTableExtension* ext = &udpa_annotations_enum_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -320,7 +320,7 @@ UPB_INLINE const udpa_annotations_MigrateAnnotation* udpa_annotations_enum_value const upb_MiniTableExtension* ext = &udpa_annotations_enum_value_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const udpa_annotations_MigrateAnnotation* default_val = NULL; const udpa_annotations_MigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -330,7 +330,7 @@ UPB_INLINE void udpa_annotations_set_enum_value_migrate(struct google_protobuf_E const upb_MiniTableExtension* ext = &udpa_annotations_enum_value_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -353,7 +353,7 @@ UPB_INLINE const udpa_annotations_FileMigrateAnnotation* udpa_annotations_file_m const upb_MiniTableExtension* ext = &udpa_annotations_file_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const udpa_annotations_FileMigrateAnnotation* default_val = NULL; const udpa_annotations_FileMigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -363,7 +363,7 @@ UPB_INLINE void udpa_annotations_set_file_migrate(struct google_protobuf_FileOpt const upb_MiniTableExtension* ext = &udpa_annotations_file_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -382,4 +382,4 @@ UPB_INLINE struct udpa_annotations_FileMigrateAnnotation* udpa_annotations_mutab #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H_ */ +#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_H_ */ 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 7031450a92..0a58179cb7 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 @@ -76,35 +76,35 @@ const upb_MiniTable udpa__annotations__FileMigrateAnnotation_msg_init = { const upb_MiniTable* udpa__annotations__FileMigrateAnnotation_msg_init_ptr = &udpa__annotations__FileMigrateAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_message_migrate_ext = { - {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_field_migrate_ext = { - {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__FieldMigrateAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_enum_migrate_ext = { - {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__EnumOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_enum_value_migrate_ext = { - {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__EnumValueOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__MigrateAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_file_migrate_ext = { - {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {171962766, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FileOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__FileMigrateAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h index d5e29c205c..798611dd8f 100644 --- a/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/migrate.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_ -#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_ +#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -38,4 +38,4 @@ extern const upb_MiniTableFile udpa_annotations_migrate_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_MINITABLE_H_ */ +#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 dc3e0cfda3..7183b34c9b 100644 --- a/src/core/ext/upb-gen/udpa/annotations/security.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/security.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ -#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ +#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_ +#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -108,7 +108,7 @@ UPB_INLINE const udpa_annotations_FieldSecurityAnnotation* udpa_annotations_secu const upb_MiniTableExtension* ext = &udpa_annotations_security_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const udpa_annotations_FieldSecurityAnnotation* default_val = NULL; const udpa_annotations_FieldSecurityAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -118,7 +118,7 @@ UPB_INLINE void udpa_annotations_set_security(struct google_protobuf_FieldOption const upb_MiniTableExtension* ext = &udpa_annotations_security_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -137,4 +137,4 @@ UPB_INLINE struct udpa_annotations_FieldSecurityAnnotation* udpa_annotations_mut #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H_ */ +#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_H_ */ 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 b68773d1dd..a531845ce2 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 @@ -39,7 +39,7 @@ const upb_MiniTable udpa__annotations__FieldSecurityAnnotation_msg_init = { const upb_MiniTable* udpa__annotations__FieldSecurityAnnotation_msg_init_ptr = &udpa__annotations__FieldSecurityAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_security_ext = { - {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {11122993, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__FieldSecurityAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h index d138b82184..14e4a6c78c 100644 --- a/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/security.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_ -#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_ +#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_security_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_MINITABLE_H_ */ +#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 47ced77bc6..7f3176dc05 100644 --- a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ -#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ +#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_ +#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -55,4 +55,4 @@ UPB_INLINE void udpa_annotations_set_sensitive(struct google_protobuf_FieldOptio #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H_ */ +#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h index e170b43b4b..688784e347 100644 --- a/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/sensitive.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_ -#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_ +#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -28,4 +28,4 @@ extern const upb_MiniTableFile udpa_annotations_sensitive_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_MINITABLE_H_ */ +#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7ee7316dd0..b2dfa63f79 100644 --- a/src/core/ext/upb-gen/udpa/annotations/status.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/status.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ -#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ +#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_ +#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -114,7 +114,7 @@ UPB_INLINE const udpa_annotations_StatusAnnotation* udpa_annotations_file_status const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const udpa_annotations_StatusAnnotation* default_val = NULL; const udpa_annotations_StatusAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -124,7 +124,7 @@ UPB_INLINE void udpa_annotations_set_file_status(struct google_protobuf_FileOpti const upb_MiniTableExtension* ext = &udpa_annotations_file_status_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -143,4 +143,4 @@ UPB_INLINE struct udpa_annotations_StatusAnnotation* udpa_annotations_mutable_fi #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H_ */ +#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_H_ */ 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 d77e7fc73a..599b84c7d2 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 @@ -38,7 +38,7 @@ const upb_MiniTable udpa__annotations__StatusAnnotation_msg_init = { const upb_MiniTable* udpa__annotations__StatusAnnotation_msg_init_ptr = &udpa__annotations__StatusAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_file_status_ext = { - {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {222707719, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FileOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__StatusAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h index 04aa1e84a8..bfd1222990 100644 --- a/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/status.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_ -#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_ +#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_status_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_MINITABLE_H_ */ +#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 57e780b674..564bbd5e71 100644 --- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h +++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ -#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ +#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_ +#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -91,7 +91,7 @@ UPB_INLINE const udpa_annotations_VersioningAnnotation* udpa_annotations_version const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const udpa_annotations_VersioningAnnotation* default_val = NULL; const udpa_annotations_VersioningAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -101,7 +101,7 @@ UPB_INLINE void udpa_annotations_set_versioning(struct google_protobuf_MessageOp const upb_MiniTableExtension* ext = &udpa_annotations_versioning_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -120,4 +120,4 @@ UPB_INLINE struct udpa_annotations_VersioningAnnotation* udpa_annotations_mutabl #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H_ */ +#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_H_ */ 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 d847c18aa5..59dc585da0 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 @@ -35,7 +35,7 @@ const upb_MiniTable udpa__annotations__VersioningAnnotation_msg_init = { const upb_MiniTable* udpa__annotations__VersioningAnnotation_msg_init_ptr = &udpa__annotations__VersioningAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension udpa_annotations_versioning_ext = { - {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {7881811, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &udpa__annotations__VersioningAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h index e1055ffb91..c395cf9628 100644 --- a/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h +++ b/src/core/ext/upb-gen/udpa/annotations/versioning.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_ -#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_ +#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ +#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -30,4 +30,4 @@ extern const upb_MiniTableFile udpa_annotations_versioning_proto_upb_file_layout #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_MINITABLE_H_ */ +#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/validate/validate.upb.h b/src/core/ext/upb-gen/validate/validate.upb.h index ee9ced7076..555b6725d9 100644 --- a/src/core/ext/upb-gen/validate/validate.upb.h +++ b/src/core/ext/upb-gen/validate/validate.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef VALIDATE_VALIDATE_PROTO_UPB_H_ -#define VALIDATE_VALIDATE_PROTO_UPB_H_ +#ifndef VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_ +#define VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -6729,7 +6729,7 @@ UPB_INLINE const validate_FieldRules* validate_rules(const struct google_protobu const upb_MiniTableExtension* ext = &validate_rules_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const validate_FieldRules* default_val = NULL; const validate_FieldRules* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -6739,7 +6739,7 @@ UPB_INLINE void validate_set_rules(struct google_protobuf_FieldOptions* msg, con const upb_MiniTableExtension* ext = &validate_rules_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -6758,4 +6758,4 @@ UPB_INLINE struct validate_FieldRules* validate_mutable_rules(struct google_prot #include "upb/port/undef.inc" -#endif /* VALIDATE_VALIDATE_PROTO_UPB_H_ */ +#endif /* VALIDATE_VALIDATE_PROTO_UPB_H__UPB_H_ */ 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 57d4fd7709..0f85e99a04 100644 --- a/src/core/ext/upb-gen/validate/validate.upb_minitable.c +++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.c @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal validate_FieldRules_submsgs[22] = { +static const upb_MiniTableSubInternal validate_FieldRules__submsgs[22] = { {.UPB_PRIVATE(submsg) = &validate__FloatRules_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &validate__DoubleRules_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &validate__Int32Rules_msg_init_ptr}, @@ -68,7 +68,7 @@ static const upb_MiniTableField validate_FieldRules__fields[22] = { }; const upb_MiniTable validate__FieldRules_msg_init = { - &validate_FieldRules_submsgs[0], + &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 @@ -497,8 +497,8 @@ const upb_MiniTable validate__BoolRules_msg_init = { }; const upb_MiniTable* validate__BoolRules_msg_init_ptr = &validate__BoolRules_msg_init; -static const upb_MiniTableSubInternal validate_StringRules_submsgs[1] = { - {.UPB_PRIVATE(subenum) = &validate_KnownRegex_enum_init}, +static const upb_MiniTableSubInternal validate_StringRules__submsgs[1] = { + {.UPB_PRIVATE(subenum) = &validate__KnownRegex_enum_init}, }; static const upb_MiniTableField validate_StringRules__fields[26] = { @@ -531,7 +531,7 @@ static const upb_MiniTableField validate_StringRules__fields[26] = { }; const upb_MiniTable validate__StringRules_msg_init = { - &validate_StringRules_submsgs[0], + &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 @@ -661,7 +661,7 @@ const upb_MiniTable validate__MessageRules_msg_init = { }; const upb_MiniTable* validate__MessageRules_msg_init_ptr = &validate__MessageRules_msg_init; -static const upb_MiniTableSubInternal validate_RepeatedRules_submsgs[1] = { +static const upb_MiniTableSubInternal validate_RepeatedRules__submsgs[1] = { {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr}, }; @@ -674,7 +674,7 @@ static const upb_MiniTableField validate_RepeatedRules__fields[5] = { }; const upb_MiniTable validate__RepeatedRules_msg_init = { - &validate_RepeatedRules_submsgs[0], + &validate_RepeatedRules__submsgs[0], &validate_RepeatedRules__fields[0], 40, 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(255), 0, #ifdef UPB_TRACING_ENABLED @@ -683,7 +683,7 @@ const upb_MiniTable validate__RepeatedRules_msg_init = { }; const upb_MiniTable* validate__RepeatedRules_msg_init_ptr = &validate__RepeatedRules_msg_init; -static const upb_MiniTableSubInternal validate_MapRules_submsgs[2] = { +static const upb_MiniTableSubInternal validate_MapRules__submsgs[2] = { {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init_ptr}, }; @@ -698,7 +698,7 @@ static const upb_MiniTableField validate_MapRules__fields[6] = { }; const upb_MiniTable validate__MapRules_msg_init = { - &validate_MapRules_submsgs[0], + &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 @@ -729,7 +729,7 @@ const upb_MiniTable validate__AnyRules_msg_init = { }; const upb_MiniTable* validate__AnyRules_msg_init_ptr = &validate__AnyRules_msg_init; -static const upb_MiniTableSubInternal validate_DurationRules_submsgs[7] = { +static const upb_MiniTableSubInternal validate_DurationRules__submsgs[7] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, @@ -751,7 +751,7 @@ static const upb_MiniTableField validate_DurationRules__fields[8] = { }; const upb_MiniTable validate__DurationRules_msg_init = { - &validate_DurationRules_submsgs[0], + &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 @@ -778,7 +778,7 @@ const upb_MiniTable validate__DurationRules_msg_init = { }; const upb_MiniTable* validate__DurationRules_msg_init_ptr = &validate__DurationRules_msg_init; -static const upb_MiniTableSubInternal validate_TimestampRules_submsgs[6] = { +static const upb_MiniTableSubInternal validate_TimestampRules__submsgs[6] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Timestamp_msg_init_ptr}, @@ -800,7 +800,7 @@ static const upb_MiniTableField validate_TimestampRules__fields[9] = { }; const upb_MiniTable validate__TimestampRules_msg_init = { - &validate_TimestampRules_submsgs[0], + &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 @@ -809,7 +809,7 @@ const upb_MiniTable validate__TimestampRules_msg_init = { }; const upb_MiniTable* validate__TimestampRules_msg_init_ptr = &validate__TimestampRules_msg_init; -const upb_MiniTableEnum validate_KnownRegex_enum_init = { +const upb_MiniTableEnum validate__KnownRegex_enum_init = { 64, 0, { @@ -841,7 +841,7 @@ const upb_MiniTableExtension validate_required_ext = { }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension validate_rules_ext = { - {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {1071, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &validate__FieldRules_msg_init}, @@ -873,7 +873,7 @@ static const upb_MiniTable *messages_layout[23] = { }; static const upb_MiniTableEnum *enums_layout[1] = { - &validate_KnownRegex_enum_init, + &validate__KnownRegex_enum_init, }; diff --git a/src/core/ext/upb-gen/validate/validate.upb_minitable.h b/src/core/ext/upb-gen/validate/validate.upb_minitable.h index 7ce848fb0f..6372b24ac8 100644 --- a/src/core/ext/upb-gen/validate/validate.upb_minitable.h +++ b/src/core/ext/upb-gen/validate/validate.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_ -#define VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_ +#ifndef VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -69,7 +69,7 @@ extern const upb_MiniTableExtension validate_ignored_ext; extern const upb_MiniTableExtension validate_required_ext; extern const upb_MiniTableExtension validate_rules_ext; -extern const upb_MiniTableEnum validate_KnownRegex_enum_init; +extern const upb_MiniTableEnum validate__KnownRegex_enum_init; extern const upb_MiniTableFile validate_validate_proto_upb_file_layout; #ifdef __cplusplus @@ -78,4 +78,4 @@ extern const upb_MiniTableFile validate_validate_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* VALIDATE_VALIDATE_PROTO_UPB_MINITABLE_H_ */ +#endif /* VALIDATE_VALIDATE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 9110870cb9..37da4270e7 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ -#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ +#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_ +#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -221,7 +221,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_messag const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_MigrateAnnotation* default_val = NULL; const xds_annotations_v3_MigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -231,7 +231,7 @@ UPB_INLINE void xds_annotations_v3_set_message_migrate(struct google_protobuf_Me const upb_MiniTableExtension* ext = &xds_annotations_v3_message_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -254,7 +254,7 @@ UPB_INLINE const xds_annotations_v3_FieldMigrateAnnotation* xds_annotations_v3_f const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_FieldMigrateAnnotation* default_val = NULL; const xds_annotations_v3_FieldMigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -264,7 +264,7 @@ UPB_INLINE void xds_annotations_v3_set_field_migrate(struct google_protobuf_Fiel const upb_MiniTableExtension* ext = &xds_annotations_v3_field_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -287,7 +287,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_m const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_MigrateAnnotation* default_val = NULL; const xds_annotations_v3_MigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -297,7 +297,7 @@ UPB_INLINE void xds_annotations_v3_set_enum_migrate(struct google_protobuf_EnumO const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -320,7 +320,7 @@ UPB_INLINE const xds_annotations_v3_MigrateAnnotation* xds_annotations_v3_enum_v const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_MigrateAnnotation* default_val = NULL; const xds_annotations_v3_MigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -330,7 +330,7 @@ UPB_INLINE void xds_annotations_v3_set_enum_value_migrate(struct google_protobuf const upb_MiniTableExtension* ext = &xds_annotations_v3_enum_value_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -353,7 +353,7 @@ UPB_INLINE const xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_fi const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_FileMigrateAnnotation* default_val = NULL; const xds_annotations_v3_FileMigrateAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -363,7 +363,7 @@ UPB_INLINE void xds_annotations_v3_set_file_migrate(struct google_protobuf_FileO const upb_MiniTableExtension* ext = &xds_annotations_v3_file_migrate_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -382,4 +382,4 @@ UPB_INLINE struct xds_annotations_v3_FileMigrateAnnotation* xds_annotations_v3_m #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H_ */ +#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_H_ */ 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 b594c78ab6..f6dd6fa313 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 @@ -76,35 +76,35 @@ const upb_MiniTable xds__annotations__v3__FileMigrateAnnotation_msg_init = { const upb_MiniTable* xds__annotations__v3__FileMigrateAnnotation_msg_init_ptr = &xds__annotations__v3__FileMigrateAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_message_migrate_ext = { - {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_field_migrate_ext = { - {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldMigrateAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_enum_migrate_ext = { - {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__EnumOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_enum_value_migrate_ext = { - {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__EnumValueOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MigrateAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_file_migrate_ext = { - {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {112948430, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FileOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FileMigrateAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h index 864d9d2ce7..c162d5926f 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/migrate.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_ -#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -38,4 +38,4 @@ extern const upb_MiniTableFile xds_annotations_v3_migrate_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 4844f703df..253ea4c7ab 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_ -#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_ +#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_H_ +#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -108,7 +108,7 @@ UPB_INLINE const xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3_ const upb_MiniTableExtension* ext = &xds_annotations_v3_security_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_FieldSecurityAnnotation* default_val = NULL; const xds_annotations_v3_FieldSecurityAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -118,7 +118,7 @@ UPB_INLINE void xds_annotations_v3_set_security(struct google_protobuf_FieldOpti const upb_MiniTableExtension* ext = &xds_annotations_v3_security_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -137,4 +137,4 @@ UPB_INLINE struct xds_annotations_v3_FieldSecurityAnnotation* xds_annotations_v3 #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H_ */ +#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_H_ */ 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 8e0f8b9080..482981f26c 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 @@ -39,7 +39,7 @@ const upb_MiniTable xds__annotations__v3__FieldSecurityAnnotation_msg_init = { const upb_MiniTable* xds__annotations__v3__FieldSecurityAnnotation_msg_init_ptr = &xds__annotations__v3__FieldSecurityAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_security_ext = { - {99044135, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {99044135, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldSecurityAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h index 790d139d81..1bcd036edb 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/security.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_ -#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -30,4 +30,4 @@ extern const upb_MiniTableFile xds_annotations_v3_security_proto_upb_file_layout #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 06293d2c02..2203655a2c 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_ -#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_ +#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_H_ +#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -55,4 +55,4 @@ UPB_INLINE void xds_annotations_v3_set_sensitive(struct google_protobuf_FieldOpt #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H_ */ +#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h index 633fca8d23..b6118daa03 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/sensitive.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_ -#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -28,4 +28,4 @@ extern const upb_MiniTableFile xds_annotations_v3_sensitive_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 dbcd9ea25b..de7b940dcb 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_ -#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_ +#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_H_ +#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -281,7 +281,7 @@ UPB_INLINE const xds_annotations_v3_FileStatusAnnotation* xds_annotations_v3_fil const upb_MiniTableExtension* ext = &xds_annotations_v3_file_status_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_FileStatusAnnotation* default_val = NULL; const xds_annotations_v3_FileStatusAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -291,7 +291,7 @@ UPB_INLINE void xds_annotations_v3_set_file_status(struct google_protobuf_FileOp const upb_MiniTableExtension* ext = &xds_annotations_v3_file_status_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -314,7 +314,7 @@ UPB_INLINE const xds_annotations_v3_MessageStatusAnnotation* xds_annotations_v3_ const upb_MiniTableExtension* ext = &xds_annotations_v3_message_status_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_MessageStatusAnnotation* default_val = NULL; const xds_annotations_v3_MessageStatusAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -324,7 +324,7 @@ UPB_INLINE void xds_annotations_v3_set_message_status(struct google_protobuf_Mes const upb_MiniTableExtension* ext = &xds_annotations_v3_message_status_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -347,7 +347,7 @@ UPB_INLINE const xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_fi const upb_MiniTableExtension* ext = &xds_annotations_v3_field_status_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_FieldStatusAnnotation* default_val = NULL; const xds_annotations_v3_FieldStatusAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -357,7 +357,7 @@ UPB_INLINE void xds_annotations_v3_set_field_status(struct google_protobuf_Field const upb_MiniTableExtension* ext = &xds_annotations_v3_field_status_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -376,4 +376,4 @@ UPB_INLINE struct xds_annotations_v3_FieldStatusAnnotation* xds_annotations_v3_m #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H_ */ +#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_H_ */ 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 e0da39655d..8a6ff44abd 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 @@ -92,21 +92,21 @@ const upb_MiniTable xds__annotations__v3__StatusAnnotation_msg_init = { const upb_MiniTable* xds__annotations__v3__StatusAnnotation_msg_init_ptr = &xds__annotations__v3__StatusAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_file_status_ext = { - {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FileOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FileStatusAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_message_status_ext = { - {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__MessageStatusAnnotation_msg_init}, }; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_field_status_ext = { - {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {226829418, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__FieldOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__FieldStatusAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h index 779ed39fa4..76356ad65a 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/status.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_ -#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -38,4 +38,4 @@ extern const upb_MiniTableFile xds_annotations_v3_status_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 5d79b12ad8..58f8018543 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_ -#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_ +#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_H_ +#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -91,7 +91,7 @@ UPB_INLINE const xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_ver const upb_MiniTableExtension* ext = &xds_annotations_v3_versioning_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); const xds_annotations_v3_VersioningAnnotation* default_val = NULL; const xds_annotations_v3_VersioningAnnotation* ret; _upb_Message_GetExtensionField((upb_Message*)msg, ext, &default_val, &ret); @@ -101,7 +101,7 @@ UPB_INLINE void xds_annotations_v3_set_versioning(struct google_protobuf_Message const upb_MiniTableExtension* ext = &xds_annotations_v3_versioning_ext; UPB_ASSUME(upb_MiniTableField_IsScalar(&ext->UPB_PRIVATE(field))); UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)( - &ext->UPB_PRIVATE(field)) == kUpb_FieldRep_8Byte); + &ext->UPB_PRIVATE(field)) == UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)); bool ok = upb_Message_SetExtension((upb_Message*)msg, ext, &val, arena); UPB_ASSERT(ok); } @@ -120,4 +120,4 @@ UPB_INLINE struct xds_annotations_v3_VersioningAnnotation* xds_annotations_v3_mu #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H_ */ +#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_H_ */ 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 0401877085..aeb57b30fe 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 @@ -35,7 +35,7 @@ const upb_MiniTable xds__annotations__v3__VersioningAnnotation_msg_init = { const upb_MiniTable* xds__annotations__v3__VersioningAnnotation_msg_init_ptr = &xds__annotations__v3__VersioningAnnotation_msg_init; UPB_LINKARR_APPEND(upb_AllExts) const upb_MiniTableExtension xds_annotations_v3_versioning_ext = { - {92389011, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)}, + {92389011, 0, 0, 0, 11, (int)kUpb_FieldMode_Scalar | (int)kUpb_LabelFlags_IsExtension | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)}, &google__protobuf__MessageOptions_msg_init, {.UPB_PRIVATE(submsg) = &xds__annotations__v3__VersioningAnnotation_msg_init}, diff --git a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h index 3802693739..e0fcc290de 100644 --- a/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/annotations/v3/versioning.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_ -#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -30,4 +30,4 @@ extern const upb_MiniTableFile xds_annotations_v3_versioning_proto_upb_file_layo #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 bd4e7ae3b8..db7e0d3788 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ -#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ +#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_H_ +#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -87,4 +87,4 @@ UPB_INLINE void xds_core_v3_Authority_set_name(xds_core_v3_Authority *msg, upb_S #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ */ +#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h index 5c591ab417..fedb1d1c18 100644 --- a/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/authority.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_ -#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_authority_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 6d6f2376ca..a7ca184455 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H_ -#define XDS_CORE_V3_CIDR_PROTO_UPB_H_ +#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_H_ +#define XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -119,4 +119,4 @@ UPB_INLINE struct google_protobuf_UInt32Value* xds_core_v3_CidrRange_mutable_pre #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_H_ */ +#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_H_ */ 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 e2c6437a56..52994a4f27 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_core_v3_CidrRange_submsgs[1] = { +static const upb_MiniTableSubInternal xds_core_v3_CidrRange__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__UInt32Value_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField xds_core_v3_CidrRange__fields[2] = { }; const upb_MiniTable xds__core__v3__CidrRange_msg_init = { - &xds_core_v3_CidrRange_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h index 9939d28f77..263126dab8 100644 --- a/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/cidr.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_ -#define XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_cidr_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 628ebd9d48..4a7b0ce25e 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ -#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ +#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_H_ +#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -246,4 +246,4 @@ UPB_INLINE struct google_protobuf_Any* xds_core_v3_CollectionEntry_InlineEntry_m #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ */ +#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_H_ */ 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 212ef1653a..ca22ab420b 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry_submsgs[2] = { +static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__core__v3__CollectionEntry__InlineEntry_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField xds_core_v3_CollectionEntry__fields[2] = { }; const upb_MiniTable xds__core__v3__CollectionEntry_msg_init = { - &xds_core_v3_CollectionEntry_submsgs[0], + &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 @@ -44,7 +44,7 @@ const upb_MiniTable xds__core__v3__CollectionEntry_msg_init = { }; const upb_MiniTable* xds__core__v3__CollectionEntry_msg_init_ptr = &xds__core__v3__CollectionEntry_msg_init; -static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry_InlineEntry_submsgs[1] = { +static const upb_MiniTableSubInternal xds_core_v3_CollectionEntry_InlineEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -55,7 +55,7 @@ static const upb_MiniTableField xds_core_v3_CollectionEntry_InlineEntry__fields[ }; const upb_MiniTable xds__core__v3__CollectionEntry__InlineEntry_msg_init = { - &xds_core_v3_CollectionEntry_InlineEntry_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h index 41190f6fb2..1914598799 100644 --- a/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/collection_entry.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_ -#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_core_v3_collection_entry_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h b/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h index d3321320eb..dd27087ffb 100644 --- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h +++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ -#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ +#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_H_ +#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -148,4 +148,4 @@ UPB_INLINE void xds_core_v3_ContextParams_ParamsEntry_set_value(xds_core_v3_Cont #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ */ +#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_H_ */ 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 2456df79ab..67677719c2 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 @@ -15,7 +15,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_core_v3_ContextParams_submsgs[1] = { +static const upb_MiniTableSubInternal xds_core_v3_ContextParams__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams__ParamsEntry_msg_init_ptr}, }; @@ -24,7 +24,7 @@ static const upb_MiniTableField xds_core_v3_ContextParams__fields[1] = { }; const upb_MiniTable xds__core__v3__ContextParams_msg_init = { - &xds_core_v3_ContextParams_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h index 6d9fdd2b1a..213ee86860 100644 --- a/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/context_params.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_ -#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_core_v3_context_params_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 f562a9c001..e6b67a0f06 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H_ -#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H_ +#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_ +#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -118,4 +118,4 @@ UPB_INLINE struct google_protobuf_Any* xds_core_v3_TypedExtensionConfig_mutable_ #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H_ */ +#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_H_ */ 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 951a460aba..a61b480216 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 @@ -16,7 +16,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_core_v3_TypedExtensionConfig_submsgs[1] = { +static const upb_MiniTableSubInternal xds_core_v3_TypedExtensionConfig__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField xds_core_v3_TypedExtensionConfig__fields[2] = { }; const upb_MiniTable xds__core__v3__TypedExtensionConfig_msg_init = { - &xds_core_v3_TypedExtensionConfig_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h index c8b3bcfab9..4e1f351237 100644 --- a/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/extension.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ -#define XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_extension_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 68dcff3e66..7f480b87ff 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ -#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ +#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_H_ +#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -150,4 +150,4 @@ UPB_INLINE struct google_protobuf_Any* xds_core_v3_Resource_mutable_resource(xds #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_H_ */ 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 fba9de9595..2c6efb8286 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_core_v3_Resource_submsgs[2] = { +static const upb_MiniTableSubInternal xds_core_v3_Resource__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceName_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__Any_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField xds_core_v3_Resource__fields[3] = { }; const upb_MiniTable xds__core__v3__Resource_msg_init = { - &xds_core_v3_Resource_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h index d74344dd54..a0c5c7719d 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_ -#define XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_resource_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 2af90d2eed..3a58954cfe 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ -#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ +#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_H_ +#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -348,4 +348,4 @@ UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_entry(xds_core_v3_Reso #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_H_ */ 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 4bc637032e..a0c5dee789 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_submsgs[2] = { +static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator__Directive_msg_init_ptr}, }; @@ -32,7 +32,7 @@ static const upb_MiniTableField xds_core_v3_ResourceLocator__fields[6] = { }; const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = { - &xds_core_v3_ResourceLocator_submsgs[0], + &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 @@ -51,7 +51,7 @@ const upb_MiniTable xds__core__v3__ResourceLocator_msg_init = { }; const upb_MiniTable* xds__core__v3__ResourceLocator_msg_init_ptr = &xds__core__v3__ResourceLocator_msg_init; -static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_Directive_submsgs[1] = { +static const upb_MiniTableSubInternal xds_core_v3_ResourceLocator_Directive__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__ResourceLocator_msg_init_ptr}, }; @@ -61,7 +61,7 @@ static const upb_MiniTableField xds_core_v3_ResourceLocator_Directive__fields[2] }; const upb_MiniTable xds__core__v3__ResourceLocator__Directive_msg_init = { - &xds_core_v3_ResourceLocator_Directive_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h index 7917c25ebf..9cb499138b 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource_locator.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_ -#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_core_v3_resource_locator_proto_upb_file_layou #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 32f2372f9a..8c3bfa5555 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ -#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ +#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_ +#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -151,4 +151,4 @@ UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceName_mutable_co #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_H_ */ 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 990b69f355..b6e5bee559 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_core_v3_ResourceName_submsgs[1] = { +static const upb_MiniTableSubInternal xds_core_v3_ResourceName__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__ContextParams_msg_init_ptr}, }; @@ -29,7 +29,7 @@ static const upb_MiniTableField xds_core_v3_ResourceName__fields[4] = { }; const upb_MiniTable xds__core__v3__ResourceName_msg_init = { - &xds_core_v3_ResourceName_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h index f8267e3bb8..9a031f751a 100644 --- a/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/core/v3/resource_name.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_ -#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_core_v3_resource_name_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 5387489436..080d91922f 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_ -#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_ +#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_ +#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -400,4 +400,4 @@ UPB_INLINE void xds_data_orca_v3_OrcaLoadReport_NamedMetricsEntry_set_value(xds_ #include "upb/port/undef.inc" -#endif /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H_ */ +#endif /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_H_ */ 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 ce2cd2c5df..76bf9a2c30 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 @@ -15,7 +15,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_data_orca_v3_OrcaLoadReport_submsgs[3] = { +static const upb_MiniTableSubInternal xds_data_orca_v3_OrcaLoadReport__submsgs[3] = { {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__RequestCostEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__UtilizationEntry_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__data__orca__v3__OrcaLoadReport__NamedMetricsEntry_msg_init_ptr}, @@ -34,7 +34,7 @@ static const upb_MiniTableField xds_data_orca_v3_OrcaLoadReport__fields[9] = { }; const upb_MiniTable xds__data__orca__v3__OrcaLoadReport_msg_init = { - &xds_data_orca_v3_OrcaLoadReport_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h index 26c4f1a225..588a0d8cd8 100644 --- a/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ -#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -35,4 +35,4 @@ extern const upb_MiniTableFile xds_data_orca_v3_orca_load_report_proto_upb_file_ #include "upb/port/undef.inc" -#endif /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_DATA_ORCA_V3_ORCA_LOAD_REPORT_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 d97de133d7..96e1fc0441 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_ -#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_ +#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_ +#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -162,4 +162,4 @@ UPB_INLINE bool xds_service_orca_v3_OrcaLoadReportRequest_add_request_cost_names #include "upb/port/undef.inc" -#endif /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H_ */ +#endif /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_H_ */ 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 bc29b177b9..38cb6e6e75 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 @@ -16,7 +16,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_service_orca_v3_OrcaLoadReportRequest_submsgs[1] = { +static const upb_MiniTableSubInternal xds_service_orca_v3_OrcaLoadReportRequest__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Duration_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField xds_service_orca_v3_OrcaLoadReportRequest__field }; const upb_MiniTable xds__service__orca__v3__OrcaLoadReportRequest_msg_init = { - &xds_service_orca_v3_OrcaLoadReportRequest_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h index 84a4558121..9b6c6d8163 100644 --- a/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_ -#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_service_orca_v3_orca_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_SERVICE_ORCA_V3_ORCA_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 f7f399d8e2..9e696a7f42 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ -#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ +#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -119,4 +119,4 @@ UPB_INLINE void xds_type_matcher_v3_CelMatcher_set_description(xds_type_matcher_ #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_H_ */ 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 ec3d622662..acf434c82a 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_matcher_v3_CelMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_CelMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField xds_type_matcher_v3_CelMatcher__fields[2] = { }; const upb_MiniTable xds__type__matcher__v3__CelMatcher_msg_init = { - &xds_type_matcher_v3_CelMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h index 069f621b00..6453b80eb7 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/cel.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_cel_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 401a2a2f54..e502eb6fb7 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_ -#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_ +#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -269,4 +269,4 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Serve #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_H_ */ 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 8aca8eb56f..542d8efa71 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher__fields[1] }; const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = { - &xds_type_matcher_v3_ServerNameMatcher_submsgs[0], + &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 @@ -39,7 +39,7 @@ const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__ServerNameMatcher_msg_init_ptr = &xds__type__matcher__v3__ServerNameMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_ServerNameMatcher_DomainMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -49,7 +49,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ServerNameMatcher_DomainMatc }; const upb_MiniTable xds__type__matcher__v3__ServerNameMatcher__DomainMatcher_msg_init = { - &xds_type_matcher_v3_ServerNameMatcher_DomainMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h index 8b5ed52ee4..1aac5049dc 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/domain.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_domain_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h index 3ddb1eb037..261e81a0ba 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ -#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ +#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -70,4 +70,4 @@ UPB_INLINE char* xds_type_matcher_v3_HttpAttributesCelMatchInput_serialize_ex(co #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h index bf0e0a5883..4f9999c853 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/http_inputs.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_http_inputs_proto_upb_file_la #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 c4e910435b..ee565a53ab 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_ -#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_ +#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -294,4 +294,4 @@ UPB_INLINE void xds_type_matcher_v3_IPMatcher_IPRangeMatcher_set_exclusive(xds_t #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_H_ */ 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 1a060de54d..a5c8e4ed99 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__IPMatcher__IPRangeMatcher_msg_init_ptr}, }; @@ -27,7 +27,7 @@ static const upb_MiniTableField xds_type_matcher_v3_IPMatcher__fields[1] = { }; const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = { - &xds_type_matcher_v3_IPMatcher_submsgs[0], + &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 @@ -40,7 +40,7 @@ const upb_MiniTable xds__type__matcher__v3__IPMatcher_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__IPMatcher_msg_init_ptr = &xds__type__matcher__v3__IPMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_IPRangeMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_IPMatcher_IPRangeMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__CidrRange_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -52,7 +52,7 @@ static const upb_MiniTableField xds_type_matcher_v3_IPMatcher_IPRangeMatcher__fi }; 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__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 diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h index 520d811a1f..c80fb54536 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/ip.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_ip_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 106faabaaf..adfffe016d 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ -#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ +#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -1202,4 +1202,4 @@ UPB_INLINE void xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_set_va #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_H_ */ 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 d2d39d6dbd..8925f1c48c 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 @@ -18,7 +18,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_submsgs[3] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher__submsgs[3] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, @@ -31,7 +31,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher__fields[3] = { }; const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = { - &xds_type_matcher_v3_Matcher_submsgs[0], + &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 @@ -46,7 +46,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__Matcher_msg_init_ptr = &xds__type__matcher__v3__Matcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_OnMatch_submsgs[2] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_OnMatch__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, }; @@ -57,7 +57,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_OnMatch__fields[2] = }; 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__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 @@ -72,7 +72,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__OnMatch_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr = &xds__type__matcher__v3__Matcher__OnMatch_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr}, }; @@ -81,7 +81,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList__fields[ }; 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__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 @@ -94,7 +94,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[4] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate__submsgs[4] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr}, @@ -109,7 +109,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat }; const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init = { - &xds_type_matcher_v3_Matcher_MatcherList_Predicate_submsgs[0], + &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 @@ -128,7 +128,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_ }; const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[3] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate__submsgs[3] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, @@ -141,7 +141,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat }; const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init = { - &xds_type_matcher_v3_Matcher_MatcherList_Predicate_SinglePredicate_submsgs[0], + &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 @@ -156,7 +156,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Sin }; const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__SinglePredicate_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, }; @@ -165,7 +165,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_Predicat }; const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init = { - &xds_type_matcher_v3_Matcher_MatcherList_Predicate_PredicateList_submsgs[0], + &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 @@ -178,7 +178,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__Predicate__Pre }; const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__Predicate__PredicateList_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherList__Predicate_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -189,7 +189,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherList_FieldMat }; const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init = { - &xds_type_matcher_v3_Matcher_MatcherList_FieldMatcher_submsgs[0], + &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 @@ -198,7 +198,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_m }; const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherList__FieldMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_submsgs[4] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree__submsgs[4] = { {.UPB_PRIVATE(submsg) = &xds__core__v3__TypedExtensionConfig_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr}, @@ -213,7 +213,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree__fields[ }; 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__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 @@ -232,7 +232,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init_ptr}, }; @@ -241,7 +241,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap }; const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init = { - &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_submsgs[0], + &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 @@ -250,7 +250,7 @@ const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_i }; const upb_MiniTable* xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init_ptr = &xds__type__matcher__v3__Matcher__MatcherTree__MatchMap_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -260,7 +260,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Matcher_MatcherTree_MatchMap }; const upb_MiniTable xds__type__matcher__v3__Matcher__MatcherTree__MatchMap__MapEntry_msg_init = { - &xds_type_matcher_v3_Matcher_MatcherTree_MatchMap_MapEntry_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h index a4ec6a0eaa..6a67d6fd1a 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/matcher.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -47,4 +47,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_matcher_proto_upb_file_layout #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 8c09777054..a001973403 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ -#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ +#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -763,4 +763,4 @@ UPB_INLINE struct xds_type_matcher_v3_Matcher_OnMatch* xds_type_matcher_v3_Doubl #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_H_ */ 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 22480cce48..396748bc15 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 @@ -17,7 +17,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr}, }; @@ -26,7 +26,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher__fields[1] }; const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = { - &xds_type_matcher_v3_Int64RangeMatcher_submsgs[0], + &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 @@ -39,7 +39,7 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int64RangeMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__type__v3__Int64Range_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -50,7 +50,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int64RangeMatcher_RangeMatch }; const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init = { - &xds_type_matcher_v3_Int64RangeMatcher_RangeMatcher_submsgs[0], + &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 @@ -63,7 +63,7 @@ const upb_MiniTable xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_ }; const upb_MiniTable* xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int64RangeMatcher__RangeMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr}, }; @@ -72,7 +72,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher__fields[1] }; const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = { - &xds_type_matcher_v3_Int32RangeMatcher_submsgs[0], + &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 @@ -85,7 +85,7 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int32RangeMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__type__v3__Int32Range_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -96,7 +96,7 @@ static const upb_MiniTableField xds_type_matcher_v3_Int32RangeMatcher_RangeMatch }; const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init = { - &xds_type_matcher_v3_Int32RangeMatcher_RangeMatcher_submsgs[0], + &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 @@ -109,7 +109,7 @@ const upb_MiniTable xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_ }; const upb_MiniTable* xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init_ptr = &xds__type__matcher__v3__Int32RangeMatcher__RangeMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init_ptr}, }; @@ -118,7 +118,7 @@ static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher__fields[1 }; const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = { - &xds_type_matcher_v3_DoubleRangeMatcher_submsgs[0], + &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 @@ -131,7 +131,7 @@ const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__DoubleRangeMatcher_msg_init_ptr = &xds__type__matcher__v3__DoubleRangeMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[2] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__type__v3__DoubleRange_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__Matcher__OnMatch_msg_init_ptr}, }; @@ -142,7 +142,7 @@ static const upb_MiniTableField xds_type_matcher_v3_DoubleRangeMatcher_RangeMatc }; const upb_MiniTable xds__type__matcher__v3__DoubleRangeMatcher__RangeMatcher_msg_init = { - &xds_type_matcher_v3_DoubleRangeMatcher_RangeMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h index 04bc4f230b..8933062cee 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/range.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -39,4 +39,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_range_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7d0f74c290..78287aa12d 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ -#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ +#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -164,4 +164,4 @@ UPB_INLINE char* xds_type_matcher_v3_RegexMatcher_GoogleRE2_serialize_ex(const x #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_H_ */ 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 cd151d6bdc..18cece098b 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 @@ -15,7 +15,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_matcher_v3_RegexMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_RegexMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher__GoogleRE2_msg_init_ptr}, }; @@ -25,7 +25,7 @@ static const upb_MiniTableField xds_type_matcher_v3_RegexMatcher__fields[2] = { }; const upb_MiniTable xds__type__matcher__v3__RegexMatcher_msg_init = { - &xds_type_matcher_v3_RegexMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h index dd933ba2fb..8b738b4090 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/regex.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_regex_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 7e2f1abec1..3ae9b081a8 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ -#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ +#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -317,4 +317,4 @@ UPB_INLINE struct xds_type_matcher_v3_StringMatcher* xds_type_matcher_v3_ListStr #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_H_ */ 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 5d2adb5f53..f51ab159c6 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 @@ -16,7 +16,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_matcher_v3_StringMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_StringMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__RegexMatcher_msg_init_ptr}, }; @@ -30,7 +30,7 @@ static const upb_MiniTableField xds_type_matcher_v3_StringMatcher__fields[6] = { }; const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = { - &xds_type_matcher_v3_StringMatcher_submsgs[0], + &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 @@ -49,7 +49,7 @@ const upb_MiniTable xds__type__matcher__v3__StringMatcher_msg_init = { }; const upb_MiniTable* xds__type__matcher__v3__StringMatcher_msg_init_ptr = &xds__type__matcher__v3__StringMatcher_msg_init; -static const upb_MiniTableSubInternal xds_type_matcher_v3_ListStringMatcher_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_matcher_v3_ListStringMatcher__submsgs[1] = { {.UPB_PRIVATE(submsg) = &xds__type__matcher__v3__StringMatcher_msg_init_ptr}, }; @@ -58,7 +58,7 @@ static const upb_MiniTableField xds_type_matcher_v3_ListStringMatcher__fields[1] }; const upb_MiniTable xds__type__matcher__v3__ListStringMatcher_msg_init = { - &xds_type_matcher_v3_ListStringMatcher_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h index 06b77ab34a..c721756b2b 100644 --- a/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/matcher/v3/string.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_matcher_v3_string_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 9567892410..409f2ccc6d 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H_ -#define XDS_TYPE_V3_CEL_PROTO_UPB_H_ +#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -246,4 +246,4 @@ UPB_INLINE struct google_protobuf_StringValue* xds_type_v3_CelExtractString_muta #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_H_ */ 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 d3b5d22c5a..ce3944ad1a 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 @@ -19,7 +19,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_v3_CelExpression_submsgs[2] = { +static const upb_MiniTableSubInternal xds_type_v3_CelExpression__submsgs[2] = { {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__ParsedExpr_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__api__expr__v1alpha1__CheckedExpr_msg_init_ptr}, }; @@ -30,7 +30,7 @@ static const upb_MiniTableField xds_type_v3_CelExpression__fields[2] = { }; const upb_MiniTable xds__type__v3__CelExpression_msg_init = { - &xds_type_v3_CelExpression_submsgs[0], + &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 @@ -45,7 +45,7 @@ const upb_MiniTable xds__type__v3__CelExpression_msg_init = { }; const upb_MiniTable* xds__type__v3__CelExpression_msg_init_ptr = &xds__type__v3__CelExpression_msg_init; -static const upb_MiniTableSubInternal xds_type_v3_CelExtractString_submsgs[2] = { +static const upb_MiniTableSubInternal xds_type_v3_CelExtractString__submsgs[2] = { {.UPB_PRIVATE(submsg) = &xds__type__v3__CelExpression_msg_init_ptr}, {.UPB_PRIVATE(submsg) = &google__protobuf__StringValue_msg_init_ptr}, }; @@ -56,7 +56,7 @@ static const upb_MiniTableField xds_type_v3_CelExtractString__fields[2] = { }; const upb_MiniTable xds__type__v3__CelExtractString_msg_init = { - &xds_type_v3_CelExtractString_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h index a297965182..2f12b4a074 100644 --- a/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/v3/cel.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -31,4 +31,4 @@ extern const upb_MiniTableFile xds_type_v3_cel_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 26bfecce26..66261aab98 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 @@ -6,13 +6,14 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H_ -#define XDS_TYPE_V3_RANGE_PROTO_UPB_H_ +#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" #include "xds/type/v3/range.upb_minitable.h" + // Must be last. #include "upb/port/def.inc" @@ -242,4 +243,4 @@ UPB_INLINE void xds_type_v3_DoubleRange_set_end(xds_type_v3_DoubleRange *msg, do #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_H_ */ diff --git a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h index 6def17ae88..e4034aa6a9 100644 --- a/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/v3/range.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -33,4 +33,4 @@ extern const upb_MiniTableFile xds_type_v3_range_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPB_MINITABLE_H_ */ 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 e5853a5949..3e8e8749be 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_ -#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_ +#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_ +#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_ #include "upb/generated_code_support.h" @@ -117,4 +117,4 @@ UPB_INLINE struct google_protobuf_Struct* xds_type_v3_TypedStruct_mutable_value( #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H_ */ +#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_H_ */ 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 59b6c6bef8..d6e37b8993 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 @@ -15,7 +15,7 @@ #include "upb/port/def.inc" extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken); -static const upb_MiniTableSubInternal xds_type_v3_TypedStruct_submsgs[1] = { +static const upb_MiniTableSubInternal xds_type_v3_TypedStruct__submsgs[1] = { {.UPB_PRIVATE(submsg) = &google__protobuf__Struct_msg_init_ptr}, }; @@ -25,7 +25,7 @@ static const upb_MiniTableField xds_type_v3_TypedStruct__fields[2] = { }; const upb_MiniTable xds__type__v3__TypedStruct_msg_init = { - &xds_type_v3_TypedStruct_submsgs[0], + &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 diff --git a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h index 810baf16a8..c3d3bef118 100644 --- a/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h +++ b/src/core/ext/upb-gen/xds/type/v3/typed_struct.upb_minitable.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_ -#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_ +#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ +#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ #include "upb/generated_code_support.h" @@ -29,4 +29,4 @@ extern const upb_MiniTableFile xds_type_v3_typed_struct_proto_upb_file_layout; #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_MINITABLE_H_ */ +#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPB_MINITABLE_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h index 0dc25530d4..18f4d0ff54 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/certs.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SubjectAlternateName_getmsgdef(u #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_CERTS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h index d20a738a25..17caac6faf 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/clusters.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_HostHealthStatus_getmsgdef(upb_D #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_CLUSTERS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h index e3e17cf610..805ad2bee1 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SecretsConfigDump_StaticSecret_g #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h index 39f42f9417..ea680b5b21 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/config_dump_shared.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -120,4 +120,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig_ #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_SHARED_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h index 41edace56d..ae90b34645 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/init_dump.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_UnreadyTargetsDumps_UnreadyTarge #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_INIT_DUMP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h index 8b84c569f7..9d2094e709 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/listeners.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_ListenerStatus_getmsgdef(upb_Def #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_LISTENERS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h index 4bc9bb674c..685876f45b 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/memory.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_Memory_getmsgdef(upb_DefPool *s) #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_MEMORY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h index e5b2ad86d4..cece2965c4 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/metrics.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_SimpleMetric_getmsgdef(upb_DefPo #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_METRICS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h index d9baa7af0d..10ca8d59b6 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/mutex_stats.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_MutexStats_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_MUTEX_STATS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h index 9540a6ed1b..5cee7dacdd 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/server_info.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_CommandLineOptions_getmsgdef(upb #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_SERVER_INFO_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h index c112e6d9a6..98a30d2089 100644 --- a/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/admin/v3/tap.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_ -#define ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_admin_v3_TapRequest_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ADMIN_V3_TAP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h index d856357087..e0bd93e5b0 100644 --- a/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/annotations/deprecation.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_ -#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_annotations_deprecation_proto_upbdefinit; #include "upb/port/undef.inc" -#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ANNOTATIONS_DEPRECATION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h index 5dd135ccae..74dbb77957 100644 --- a/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/annotations/resource.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_ -#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_annotations_ResourceAnnotation_getmsgdef( #include "upb/port/undef.inc" -#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_ANNOTATIONS_RESOURCE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h index 510a16364f..74789cb5b1 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/accesslog/v3/accesslog.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -105,4 +105,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_accesslog_v3_ExtensionFilter_getms #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_ */ 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 ac8f021d9a..f84fe1b3bd 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -140,4 +140,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_bootstrap_v3_MemoryAllocatorManage #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h index 019956e736..1458f37148 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/circuit_breaker.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_CircuitBreakers_Thresho #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_CIRCUIT_BREAKER_PROTO_UPB_H__UPBDEFS_H_ */ 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 17dc4bc74b..a55e408b21 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -150,4 +150,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_TrackClusterStats_getms #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h index e3ce99adae..e61bfddbf2 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/filter.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_Filter_getmsgdef(upb_De #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_FILTER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h index 679f51e2dc..c852757d93 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/cluster/v3/outlier_detection.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_cluster_v3_OutlierDetection_getmsg #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CLUSTER_V3_OUTLIER_DETECTION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h index 0ce406c241..a833c29a2b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/common/matcher/v3/matcher.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -100,4 +100,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_common_matcher_v3_HttpGenericBodyM #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_COMMON_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h index 3a1568bb44..349cbd1a2f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/address.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -65,4 +65,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_CidrRange_getmsgdef(upb_De #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_ADDRESS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h index b4542e33f0..4c293523da 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/backoff.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_BackoffStrategy_getmsgdef( #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_BACKOFF_PROTO_UPB_H__UPBDEFS_H_ */ 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 e3fea17f1f..4661fd4359 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -170,4 +170,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_ControlPlane_getmsgdef(upb #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_BASE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h index e293a2c7c6..8ab7eadb5f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/config_source.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_ExtensionConfigSource_getm #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_CONFIG_SOURCE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h index f4aa65ec9d..e6ccd74e27 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/event_service_config.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_EventServiceConfig_getmsgd #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_EVENT_SERVICE_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h index 842d01c009..aa5c05449f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/extension.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_TypedExtensionConfig_getms #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h index b0554f4ae2..1edb55167b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_method_list.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_GrpcMethodList_Service_get #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_GRPC_METHOD_LIST_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h index fa980d3682..89d492aa37 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/grpc_service.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -95,4 +95,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_GrpcService_GoogleGrpc_Cha #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_GRPC_SERVICE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h index 7898993f4a..5884c02a67 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/health_check.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -70,4 +70,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_HealthCheck_TlsOptions_get #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HEALTH_CHECK_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h index 114fda0a20..2cc8489c92 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_service.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_HttpService_getmsgdef(upb_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HTTP_SERVICE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h index 9d70352d97..bc15e923d5 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/http_uri.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_HttpUri_getmsgdef(upb_DefP #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_HTTP_URI_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h index dc12ad47b9..1d7c5da838 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/protocol.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -105,4 +105,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_SchemeHeaderTransformation #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h index 2d843bf102..9b899cc27b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/proxy_protocol.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_ProxyProtocolConfig_getmsg #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_PROXY_PROTOCOL_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h index 284b06105c..2d557070a8 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/resolver.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_DnsResolutionConfig_getmsg #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_RESOLVER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h index 073e069885..7c69fc1dc8 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/socket_option.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_SocketOptionsOverride_getm #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_SOCKET_OPTION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h index 9fdf2a878b..f40503ba3a 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/substitution_format_string.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_SubstitutionFormatString_g #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_SUBSTITUTION_FORMAT_STRING_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h index d58de476c7..53669e73e5 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/core/v3/udp_socket_config.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_core_v3_UdpSocketConfig_getmsgdef( #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_CORE_V3_UDP_SOCKET_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h index 93f1ede9d7..c6243b29ba 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_ClusterLoadAssignment_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h index 5c6ce45fec..50a598fef6 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/endpoint/v3/endpoint_components.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_LocalityLbEndpoints_Lb #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_ENDPOINT_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ */ 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 828c654229..60839fe5c1 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -55,4 +55,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_endpoint_v3_ClusterStats_DroppedRe #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_ENDPOINT_V3_LOAD_REPORT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h index 5f95139409..9d97fdbce8 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/api_listener.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_ApiListener_getmsgdef( #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_API_LISTENER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h index 4529023110..c842ac2664 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -75,4 +75,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_ApiListenerManager_get #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h index aeee7425c9..7e4d04e850 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/listener_components.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_ListenerFilter_getmsgd #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_LISTENER_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h index abf4abd2cc..9ebdd236b9 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/quic_config.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_QuicProtocolOptions_ge #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_QUIC_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h index 38f8407615..e94ff22230 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/listener/v3/udp_listener_config.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_listener_v3_ActiveRawUdpListenerCo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_LISTENER_V3_UDP_LISTENER_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h index b44ee35451..ce61514667 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/metrics_service.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_metrics_v3_MetricsServiceConfig_ge #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_METRICS_V3_METRICS_SERVICE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h index 2c6e83443c..bb5750d32f 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/metrics/v3/stats.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -65,4 +65,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_metrics_v3_HystrixSink_getmsgdef(u #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h index 22eba2a893..134f95387d 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/overload/v3/overload.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -75,4 +75,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_overload_v3_OverloadManager_getmsg #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h index 96801bf79e..2a7ab7ec46 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/rbac/v3/rbac.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -80,4 +80,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_rbac_v3_Action_getmsgdef(upb_DefPo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h index 18f738b2d8..fcd71eb804 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_route_v3_Vhds_getmsgdef(upb_DefPoo #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h index 6348c5fbb8..a472e61399 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/route_components.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -315,4 +315,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_route_v3_FilterConfig_getmsgdef(up #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_ROUTE_COMPONENTS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h index acc666b3a0..2657f3cb22 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/route/v3/scoped_route.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_route_v3_ScopedRouteConfiguration_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_ROUTE_V3_SCOPED_ROUTE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h index 49fae22588..121ab876ac 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/tap/v3/common.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -85,4 +85,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_tap_v3_StreamingGrpcSink_getmsgdef #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TAP_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_ */ 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 e49b1af53f..6fbc8e8db4 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_DatadogConfig_getmsgdef(u #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_DATADOG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h index 3073196c8e..fd843bb65e 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/dynamic_ot.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_DynamicOtConfig_getmsgdef #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_DYNAMIC_OT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h index 5b61d6418c..89bf42fd38 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/http_tracer.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_Tracing_Http_getmsgdef(up #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_HTTP_TRACER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h index a315c9b6ee..185a564cfc 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/lightstep.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_LightstepConfig_getmsgdef #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_LIGHTSTEP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h index 4a09a1c624..0189f7768b 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opencensus.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_OpenCensusConfig_getmsgde #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_OPENCENSUS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h index 560d0b9097..c61e6e042d 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/opentelemetry.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_OpenTelemetryConfig_getms #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_OPENTELEMETRY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h index 22aed73c9b..5c76a63594 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/service.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_TraceServiceConfig_getmsg #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_SERVICE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h index af1307c53f..149bb51877 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/skywalking.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_ClientConfig_getmsgdef(up #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_SKYWALKING_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h index 0644987fe5..9c3bba8895 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/trace.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_config_trace_v3_trace_proto_upbdefinit; #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_TRACE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h index 9141224175..33b2e3a3cd 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/xray.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_XRayConfig_SegmentFields_ #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_XRAY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h index f323ca4be7..e5be3b8e8d 100644 --- a/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/config/trace/v3/zipkin.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_ -#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_ +#ifndef ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_config_trace_v3_ZipkinConfig_getmsgdef(up #include "upb/port/undef.inc" -#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_CONFIG_TRACE_V3_ZIPKIN_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h index 7fe7b4ef49..00d5c41fab 100644 --- a/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/data/accesslog/v3/accesslog.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ -#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -105,4 +105,4 @@ UPB_INLINE const upb_MessageDef *envoy_data_accesslog_v3_HTTPResponseProperties_ #include "upb/port/undef.inc" -#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_DATA_ACCESSLOG_V3_ACCESSLOG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h index ffdbba5602..bbe83db884 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_clusters_aggregate_v3_ClusterC #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h index 51ed4fc400..138385ac38 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_common_fault_v3_FaultR #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h index 8f0eea1ba8..1e6cd7af02 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_fault_v3_HTTPFaul #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h index 9fb2997625..6c258e3032 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_gcp_authn_v3_Toke #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_GCP_AUTHN_V3_GCP_AUTHN_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h index 6bb640ef2d..ef568185a4 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/rbac/v3/rbac.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_rbac_v3_RBACPerRo #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_RBAC_V3_RBAC_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h index 420ae5b5f6..548be8ea6e 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/router/v3/router.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_router_v3_Router_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h index 9cd7a7b851..c92a427db5 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_http_stateful_session_ #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_STATEFUL_SESSION_V3_STATEFUL_SESSION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h index 3cc2dcb9bf..6f7f93746b 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -130,4 +130,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_filters_network_http_connectio #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_FILTERS_NETWORK_HTTP_CONNECTION_MANAGER_V3_HTTP_CONNECTION_MANAGER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h index c5703f3ca4..7fcfcc1f1f 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_http_stateful_session_cookie_v #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_HTTP_STATEFUL_SESSION_COOKIE_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c new file mode 100644 index 0000000000..df2a69438c --- /dev/null +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c @@ -0,0 +1,53 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ + +#include "upb/reflection/def.h" +#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h" +#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h" + +extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit; +extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit; +extern _upb_DefPool_Init validate_validate_proto_upbdefinit; +static const char descriptor[574] = {'\n', 'R', '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', '/', 'h', 't', 't', 'p', '_', '1', '1', '_', 'p', 'r', 'o', 'x', 'y', +'/', 'v', '3', '/', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 't', 't', 'p', '_', '1', '1', '_', 'c', 'o', 'n', 'n', +'e', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '3', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', +'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 'h', 't', 't', 'p', +'_', '1', '1', '_', 'p', 'r', 'o', 'x', 'y', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', +'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', +'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', +'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', +'o', '\"', 'z', '\n', '\034', 'H', 't', 't', 'p', '1', '1', 'P', 'r', 'o', 'x', 'y', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', +'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '\022', 'Z', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', +'k', 'e', 't', '\030', '\001', ' ', '\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', 'B', '\010', +'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', +'B', '\325', '\001', '\n', 'A', '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', '.', 'h', 't', 't', 'p', '_', '1', '1', '_', 'p', 'r', 'o', 'x', 'y', '.', 'v', '3', 'B', '\032', 'U', 'p', 's', +'t', 'r', 'e', 'a', 'm', 'H', 't', 't', 'p', '1', '1', 'C', 'o', 'n', 'n', 'e', 'c', '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', '/', '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', +'/', 'h', 't', 't', 'p', '_', '1', '1', '_', 'p', 'r', 'o', 'x', 'y', '/', 'v', '3', ';', 'h', 't', 't', 'p', '_', '1', '1', +'_', 'p', 'r', 'o', 'x', 'y', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static _upb_DefPool_Init *deps[4] = { + &envoy_config_core_v3_base_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +_upb_DefPool_Init envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upbdefinit = { + deps, + &envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upb_file_layout, + "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto", + UPB_STRINGVIEW_INIT(descriptor, 574) +}; diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h new file mode 100644 index 0000000000..3c1cd2ac9f --- /dev/null +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h @@ -0,0 +1,33 @@ +/* This file was generated by upb_generator from the input file: + * + * envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. + * NO CHECKED-IN PROTOBUF GENCODE */ + +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPBDEFS_H_ + +#include "upb/reflection/def.h" +#include "upb/reflection/internal/def_pool.h" + +#include "upb/port/def.inc" // Must be last. +#ifdef __cplusplus +extern "C" { +#endif + +extern _upb_DefPool_Init envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upbdefinit; + +UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_getmsgdef(upb_DefPool *s) { + _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upbdefinit); + return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.http_11_proxy.v3.Http11ProxyUpstreamTransport"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port/undef.inc" + +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h index 634f858589..780d4f3e95 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_extensions_transport_sockets_tls_v3_cert_proto_up #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_CERT_PROTO_UPB_H__UPBDEFS_H_ */ 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 ef90ade193..a216ab2b18 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 @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -65,4 +65,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_Certi #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_COMMON_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h index 4ebda2bf46..6e4beed177 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_Secre #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_SECRET_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h index 14da9a82c7..12914bf3fb 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_Commo #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h index f8a6167936..1433f5673c 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_tls_v3_SPIFF #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_TLS_V3_TLS_SPIFFE_VALIDATOR_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h index b7d2ff3bb3..768925b4e5 100644 --- a/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPBDEFS_H_ -#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_extensions_upstreams_http_v3_HttpProtocol #include "upb/port/undef.inc" -#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_EXTENSIONS_UPSTREAMS_HTTP_V3_HTTP_PROTOCOL_OPTIONS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h index 730b46139c..527aa93bbc 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/ads.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_ -#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_service_discovery_v3_AdsDummy_getmsgdef(u #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_SERVICE_DISCOVERY_V3_ADS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h index 649abd2887..7441379d71 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/service/discovery/v3/discovery.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_ -#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_ +#ifndef ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -95,4 +95,4 @@ UPB_INLINE const upb_MessageDef *envoy_service_discovery_v3_Resource_CacheContro #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_SERVICE_DISCOVERY_V3_DISCOVERY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h index f2ee7fad41..143f2805ef 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/service/load_stats/v3/lrs.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_ -#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_service_load_stats_v3_LoadStatsResponse_g #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_SERVICE_LOAD_STATS_V3_LRS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h index 4e77cf039b..f661a0ff48 100644 --- a/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ -#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_service_status_v3_ClientStatusResponse_ge #include "upb/port/undef.inc" -#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h index 28494f58c6..056e5bb985 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_http_v3_Cookie_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_HTTP_V3_COOKIE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h index 13260845d5..56075fa940 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_http_v3_PathTransformation_Operation #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_HTTP_V3_PATH_TRANSFORMATION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h index ecd8b20929..48c4b106e9 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_FilterStateMatcher_getmsg #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_FILTER_STATE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h index 62ed58f66b..53e3249df7 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpRequestQueryParamMatc #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h index c2831b1b5a..e6dc5337d1 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_MetadataMatcher_PathSegme #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h index 8c18041a1b..cf560b36c4 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/node.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_NodeMatcher_getmsgdef(upb #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h index 7e8a427847..d2daa0ddd4 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/number.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_DoubleMatcher_getmsgdef(u #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_NUMBER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h index f4d647ee54..2f06e59fa2 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/path.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_PathMatcher_getmsgdef(upb #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_PATH_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h index 94b570b58a..c73630367b 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/regex.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_RegexMatchAndSubstitute_g #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h index cb2836d783..b05939d3e8 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/status_code_input.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_HttpResponseStatusCodeCla #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STATUS_CODE_INPUT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h index d090589f27..7c983e6a6c 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/string.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_ListStringMatcher_getmsgd #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h index ddfb4de79c..100ce3c152 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/struct.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_StructMatcher_PathSegment #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h index 12087eebc4..592875d220 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/matcher/v3/value.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_matcher_v3_OrMatcher_getmsgdef(upb_D #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_MATCHER_V3_VALUE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h index 8360c54106..4b64e5a564 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/metadata/v3/metadata.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -60,4 +60,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_metadata_v3_MetadataKind_Host_getmsg #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_METADATA_V3_METADATA_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h index 28aefb3e92..69ebb0f2a7 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/tracing/v3/custom_tag.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -50,4 +50,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_tracing_v3_CustomTag_Metadata_getmsg #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_TRACING_V3_CUSTOM_TAG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h index e290910b28..6e03c0b164 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/hash_policy.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_HashPolicy_FilterState_getmsgdef( #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_HASH_POLICY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h index 449007fde8..62b6e46051 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_type_v3_http_proto_upbdefinit; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_HTTP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h index d6e625abd3..3387450d27 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/http_status.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_HttpStatus_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_HTTP_STATUS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h index 02dc9e0e9a..0bce51053b 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/percent.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_FractionalPercent_getmsgdef(upb_D #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_PERCENT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h index c62b7ab051..47c5d2440e 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/range.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_DoubleRange_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h index b0d74d3939..891fa45177 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_strategy.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_RateLimitStrategy_RequestsPerTime #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_RATELIMIT_STRATEGY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h index 5bf0897616..e2c335da67 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/ratelimit_unit.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -25,4 +25,4 @@ extern _upb_DefPool_Init envoy_type_v3_ratelimit_unit_proto_upbdefinit; #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_RATELIMIT_UNIT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h index ff79caa0d4..e9660836d0 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/semantic_version.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_SemanticVersion_getmsgdef(upb_Def #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_SEMANTIC_VERSION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h index e80d50e4b9..dc7f4524d3 100644 --- a/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h +++ b/src/core/ext/upbdefs-gen/envoy/type/v3/token_bucket.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_ -#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_ +#ifndef ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPBDEFS_H_ +#define ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *envoy_type_v3_TokenBucket_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPBDEFS_H_ */ +#endif /* ENVOY_TYPE_V3_TOKEN_BUCKET_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h index 7939a4f327..b717df0519 100644 --- a/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/annotations.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_ -#define GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -25,4 +25,4 @@ extern _upb_DefPool_Init google_api_annotations_proto_upbdefinit; #include "upb/port/undef.inc" -#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_API_ANNOTATIONS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h index dd9f8a068b..34f23dd5cb 100644 --- a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/checked.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_ -#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -90,4 +90,4 @@ UPB_INLINE const upb_MessageDef *google_api_expr_v1alpha1_Reference_getmsgdef(up #include "upb/port/undef.inc" -#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_API_EXPR_V1ALPHA1_CHECKED_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h index 01c1211561..a3e7c1520b 100644 --- a/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/expr/v1alpha1/syntax.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_ -#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -105,4 +105,4 @@ UPB_INLINE const upb_MessageDef *google_api_expr_v1alpha1_SourcePosition_getmsgd #include "upb/port/undef.inc" -#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_API_EXPR_V1ALPHA1_SYNTAX_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h index 6af505cfee..b3b35d1343 100644 --- a/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/http.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_HTTP_PROTO_UPBDEFS_H_ -#define GOOGLE_API_HTTP_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_API_HTTP_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_API_HTTP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *google_api_CustomHttpPattern_getmsgdef(upb_DefP #include "upb/port/undef.inc" -#endif /* GOOGLE_API_HTTP_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_API_HTTP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h index 21221387ee..61f67418c8 100644 --- a/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/api/httpbody.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_ -#define GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_api_HttpBody_getmsgdef(upb_DefPool *s) { #include "upb/port/undef.inc" -#endif /* GOOGLE_API_HTTPBODY_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_API_HTTPBODY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h index ec2efbc59c..95fd3669bf 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/any.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_ -#define GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_Any_getmsgdef(upb_DefPool *s) { #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_PROTOBUF_ANY_PROTO_UPB_H__UPBDEFS_H_ */ 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 9b835ab4cc..545f4d9007 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c +++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.c @@ -10,497 +10,498 @@ #include "google/protobuf/descriptor.upbdefs.h" #include "google/protobuf/descriptor.upb_minitable.h" -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', +static const char descriptor[12296] = {'\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', +'f', '\"', '[', '\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', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', -'\004', 'f', 'i', 'l', 'e', '\"', '\230', '\005', '\n', '\023', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', -'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', -'\030', '\n', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', -'\022', '\036', '\n', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 'd', 'e', 'p', -'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '+', '\n', '\021', 'p', 'u', 'b', 'l', 'i', 'c', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', -'n', 'c', 'y', '\030', '\n', ' ', '\003', '(', '\005', 'R', '\020', 'p', 'u', 'b', 'l', 'i', 'c', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', -'c', 'y', '\022', '\'', '\n', '\017', 'w', 'e', 'a', 'k', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\013', ' ', '\003', -'(', '\005', 'R', '\016', 'w', 'e', 'a', 'k', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', 'C', '\n', '\014', 'm', 'e', 's', -'s', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', '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', 'R', -'\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', -'\030', '\005', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', -'T', 'y', 'p', 'e', '\022', 'A', '\n', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', -'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'C', '\n', '\t', -'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', -'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', -'s', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'I', '\n', '\020', -'s', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'd', 'e', '_', 'i', 'n', 'f', 'o', '\030', '\t', ' ', '\001', '(', '\013', '2', '\037', '.', -'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', 'R', '\016', 's', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', '\026', '\n', '\006', -'s', 'y', 'n', 't', 'a', 'x', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\006', 's', 'y', 'n', 't', 'a', 'x', '\022', '2', '\n', '\007', 'e', -'d', 'i', 't', 'i', 'o', 'n', '\030', '\016', ' ', '\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', '\"', '\271', '\006', -'\n', '\017', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ';', '\n', '\005', 'f', 'i', 'e', 'l', 'd', '\030', '\002', ' ', '\003', -'(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', -'d', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\005', 'f', 'i', 'e', 'l', 'd', '\022', 'C', -'\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\006', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', -'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', 'A', '\n', '\013', 'n', 'e', 's', 't', -'e', 'd', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\003', '(', '\013', '2', ' ', '.', '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', 'R', '\n', 'n', -'e', 's', 't', 'e', 'd', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', -'\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', -'m', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', -'e', '\022', 'X', '\n', '\017', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\005', ' ', '\003', '(', -'\013', '2', '/', '.', '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', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', -'R', '\016', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\n', 'o', 'n', 'e', 'o', 'f', -'_', 'd', 'e', 'c', 'l', '\030', '\010', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', -'R', '\t', 'o', 'n', 'e', 'o', 'f', 'D', 'e', 'c', 'l', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', -'\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', -'s', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\016', 'r', -'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\t', ' ', '\003', '(', '\013', '2', '.', '.', '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', '.', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', -'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', -'\n', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', 'z', '\n', '\016', 'E', 'x', -'t', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', -'(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', -'n', 'd', '\022', '@', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', -'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\032', '7', '\n', '\r', 'R', 'e', 's', -'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', -'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', -'\"', '\314', '\004', '\n', '\025', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', -'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', '\022', 'Y', '\n', '\013', 'd', 'e', 'c', 'l', 'a', -'r', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\003', '(', '\013', '2', '2', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', -'n', 's', '.', 'D', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\003', '\210', '\001', '\002', 'R', '\013', 'd', 'e', 'c', 'l', -'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\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', 'm', '\n', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', -'a', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '8', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', -'s', '.', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', ':', '\n', 'U', 'N', 'V', 'E', -'R', 'I', 'F', 'I', 'E', 'D', 'B', '\003', '\210', '\001', '\002', 'R', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', -'\032', '\224', '\001', '\n', '\013', 'D', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', -'r', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', '\033', '\n', '\t', 'f', 'u', 'l', 'l', '_', 'n', -'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'f', 'u', 'l', 'l', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\004', 't', 'y', -'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 't', 'y', 'p', 'e', '\022', '\032', '\n', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', -'d', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '\022', '\032', '\n', '\010', 'r', 'e', 'p', 'e', -'a', 't', 'e', 'd', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'J', '\004', '\010', '\004', '\020', -'\005', '\"', '4', '\n', '\021', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\022', '\017', '\n', -'\013', 'D', 'E', 'C', 'L', 'A', 'R', 'A', 'T', 'I', 'O', 'N', '\020', '\000', '\022', '\016', '\n', '\n', 'U', 'N', 'V', 'E', 'R', 'I', 'F', -'I', 'E', 'D', '\020', '\001', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\301', '\006', '\n', '\024', 'F', 'i', 'e', 'l', -'d', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', -'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\003', ' ', '\001', -'(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', 'A', '\n', '\005', 'l', 'a', 'b', 'e', 'l', '\030', '\004', ' ', '\001', '(', '\016', -'2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', -'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'L', 'a', 'b', 'e', 'l', 'R', '\005', 'l', 'a', 'b', -'e', 'l', '\022', '>', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\005', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'\004', 'f', 'i', 'l', 'e', '*', '\014', '\010', '\200', '\354', '\312', '\377', '\001', '\020', '\201', '\354', '\312', '\377', '\001', '\"', '\230', '\005', '\n', '\023', 'F', +'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', +'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', +'\002', ' ', '\001', '(', '\t', 'R', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '\036', '\n', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', +'n', 'c', 'y', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '+', '\n', '\021', +'p', 'u', 'b', 'l', 'i', 'c', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\n', ' ', '\003', '(', '\005', 'R', '\020', +'p', 'u', 'b', 'l', 'i', 'c', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '\'', '\n', '\017', 'w', 'e', 'a', 'k', '_', +'d', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\013', ' ', '\003', '(', '\005', 'R', '\016', 'w', 'e', 'a', 'k', 'D', 'e', 'p', +'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', 'C', '\n', '\014', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004', +' ', '\003', '(', '\013', '2', ' ', '.', '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', 'R', '\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', +'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', +'t', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\007', 's', 'e', 'r', +'v', 'i', 'c', 'e', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', +'o', 'R', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'C', '\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\007', +' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', +'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', +'s', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', +'s', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'I', '\n', '\020', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'd', 'e', +'_', 'i', 'n', 'f', 'o', '\030', '\t', ' ', '\001', '(', '\013', '2', '\037', '.', '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', 'R', '\016', 's', 'o', 'u', 'r', +'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', '\026', '\n', '\006', 's', 'y', 'n', 't', 'a', 'x', '\030', '\014', ' ', '\001', '(', +'\t', 'R', '\006', 's', 'y', 'n', 't', 'a', 'x', '\022', '2', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\016', ' ', '\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', '\"', '\271', '\006', '\n', '\017', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', +'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', +'e', '\022', ';', '\n', '\005', 'f', 'i', 'e', 'l', 'd', '\030', '\002', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', -'P', 'r', 'o', 't', 'o', '.', 'T', 'y', 'p', 'e', 'R', '\004', 't', 'y', 'p', 'e', '\022', '\033', '\n', '\t', 't', 'y', 'p', 'e', '_', -'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\010', 't', 'y', 'p', 'e', 'N', 'a', 'm', 'e', '\022', '\032', '\n', '\010', 'e', -'x', 't', 'e', 'n', 'd', 'e', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\022', '#', -'\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', -'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'o', 'n', 'e', 'o', 'f', '_', 'i', 'n', 'd', 'e', 'x', -'\030', '\t', ' ', '\001', '(', '\005', 'R', '\n', 'o', 'n', 'e', 'o', 'f', 'I', 'n', 'd', 'e', 'x', '\022', '\033', '\n', '\t', 'j', 's', 'o', -'n', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\010', 'j', 's', 'o', 'n', 'N', 'a', 'm', 'e', '\022', '7', '\n', -'\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', -'i', 'o', 'n', 's', '\022', '\'', '\n', '\017', 'p', 'r', 'o', 't', 'o', '3', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\021', -' ', '\001', '(', '\010', 'R', '\016', 'p', 'r', 'o', 't', 'o', '3', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\"', '\266', '\002', '\n', '\004', -'T', 'y', 'p', 'e', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'D', 'O', 'U', 'B', 'L', 'E', '\020', '\001', '\022', '\016', '\n', '\n', -'T', 'Y', 'P', 'E', '_', 'F', 'L', 'O', 'A', 'T', '\020', '\002', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '6', -'4', '\020', '\003', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '6', '4', '\020', '\004', '\022', '\016', '\n', '\n', 'T', -'Y', 'P', 'E', '_', 'I', 'N', 'T', '3', '2', '\020', '\005', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', -'6', '4', '\020', '\006', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\007', '\022', '\r', '\n', -'\t', 'T', 'Y', 'P', 'E', '_', 'B', 'O', 'O', 'L', '\020', '\010', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'T', 'R', 'I', -'N', 'G', '\020', '\t', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'G', 'R', 'O', 'U', 'P', '\020', '\n', '\022', '\020', '\n', '\014', 'T', -'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\013', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'B', 'Y', 'T', -'E', 'S', '\020', '\014', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '3', '2', '\020', '\r', '\022', '\r', '\n', '\t', -'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\016', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', -'D', '3', '2', '\020', '\017', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\020', '\022', -'\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '3', '2', '\020', '\021', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', -'S', 'I', 'N', 'T', '6', '4', '\020', '\022', '\"', 'C', '\n', '\005', 'L', 'a', 'b', 'e', 'l', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', -'L', '_', 'O', 'P', 'T', 'I', 'O', 'N', 'A', 'L', '\020', '\001', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'P', -'E', 'A', 'T', 'E', 'D', '\020', '\003', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', -'\020', '\002', '\"', 'c', '\n', '\024', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', -'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\007', -'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', -'o', 'n', 's', '\"', '\343', '\002', '\n', '\023', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', -'t', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '?', '\n', -'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', -'P', 'r', 'o', 't', 'o', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', -' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', -'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\016', 'r', 'e', 's', -'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', +'P', 'r', 'o', 't', 'o', 'R', '\005', 'f', 'i', 'e', 'l', 'd', '\022', 'C', '\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'\030', '\006', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', +'e', 'n', 's', 'i', 'o', 'n', '\022', 'A', '\n', '\013', 'n', 'e', 's', 't', 'e', 'd', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\003', +'(', '\013', '2', ' ', '.', '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', 'R', '\n', 'n', 'e', 's', 't', 'e', 'd', 'T', 'y', 'p', 'e', '\022', 'A', +'\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', -'P', 'r', 'o', 't', 'o', '.', 'E', 'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', -'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', -'_', 'n', 'a', 'm', 'e', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', -'\032', ';', '\n', '\021', 'E', 'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', -'s', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', -'\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '\203', '\001', '\n', '\030', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', -'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', -' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\002', ' ', '\001', '(', -'\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', ';', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', -'\013', '2', '!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', -'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\247', '\001', '\n', '\026', -'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', -'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '>', '\n', '\006', 'm', 'e', 't', 'h', -'o', 'd', '\030', '\002', ' ', '\003', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\006', -'m', 'e', 't', 'h', 'o', 'd', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\037', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', -'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\211', '\002', '\n', '\025', 'M', 'e', 't', 'h', 'o', -'d', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', -'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\035', '\n', '\n', 'i', 'n', 'p', 'u', 't', '_', 't', 'y', 'p', 'e', -'\030', '\002', ' ', '\001', '(', '\t', 'R', '\t', 'i', 'n', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\013', 'o', 'u', 't', 'p', -'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\n', 'o', 'u', 't', 'p', 'u', 't', 'T', 'y', 'p', 'e', -'\022', '8', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', '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', 'R', -'\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '0', '\n', '\020', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', -'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', '\"', '\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', -'C', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\022', '5', '\n', '\023', 'j', 'a', 'v', 'a', '_', 'm', 'u', 'l', 't', 'i', 'p', 'l', -'e', '_', 'f', 'i', 'l', 'e', 's', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'j', 'a', 'v', -'a', 'M', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'F', 'i', 'l', 'e', 's', '\022', 'D', '\n', '\035', 'j', 'a', 'v', 'a', '_', 'g', 'e', -'n', 'e', 'r', 'a', 't', 'e', '_', 'e', 'q', 'u', 'a', 'l', 's', '_', 'a', 'n', 'd', '_', 'h', 'a', 's', 'h', '\030', '\024', ' ', -'\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\031', 'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'E', 'q', 'u', 'a', -'l', 's', 'A', 'n', 'd', 'H', 'a', 's', 'h', '\022', ':', '\n', '\026', 'j', 'a', 'v', 'a', '_', 's', 't', 'r', 'i', 'n', 'g', '_', -'c', 'h', 'e', 'c', 'k', '_', 'u', 't', 'f', '8', '\030', '\033', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', -'j', 'a', 'v', 'a', 'S', 't', 'r', 'i', 'n', 'g', 'C', 'h', 'e', 'c', 'k', 'U', 't', 'f', '8', '\022', 'S', '\n', '\014', 'o', 'p', -'t', 'i', 'm', 'i', 'z', 'e', '_', 'f', 'o', 'r', '\030', '\t', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 'p', 't', -'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', ':', '\005', 'S', 'P', 'E', 'E', 'D', 'R', '\013', 'o', 'p', 't', 'i', 'm', 'i', 'z', -'e', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'g', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\013', ' ', '\001', '(', '\t', 'R', -'\t', 'g', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '5', '\n', '\023', 'c', 'c', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', -'s', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'c', 'c', -'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '9', '\n', '\025', 'j', 'a', 'v', 'a', '_', 'g', -'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\021', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', -'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', -'5', '\n', '\023', 'p', 'y', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\022', ' ', -'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'p', 'y', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', -'i', 'c', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\027', ' ', '\001', '(', '\010', ':', -'\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '.', '\n', '\020', 'c', 'c', '_', -'e', 'n', 'a', 'b', 'l', 'e', '_', 'a', 'r', 'e', 'n', 'a', 's', '\030', '\037', ' ', '\001', '(', '\010', ':', '\004', 't', 'r', 'u', 'e', -'R', '\016', 'c', 'c', 'E', 'n', 'a', 'b', 'l', 'e', 'A', 'r', 'e', 'n', 'a', 's', '\022', '*', '\n', '\021', 'o', 'b', 'j', 'c', '_', -'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '$', ' ', '\001', '(', '\t', 'R', '\017', 'o', 'b', 'j', 'c', 'C', -'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022', ')', '\n', '\020', 'c', 's', 'h', 'a', 'r', 'p', '_', 'n', 'a', 'm', 'e', -'s', 'p', 'a', 'c', 'e', '\030', '%', ' ', '\001', '(', '\t', 'R', '\017', 'c', 's', 'h', 'a', 'r', 'p', 'N', 'a', 'm', 'e', 's', 'p', -'a', 'c', 'e', '\022', '!', '\n', '\014', 's', 'w', 'i', 'f', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\'', ' ', '\001', '(', '\t', -'R', '\013', 's', 'w', 'i', 'f', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '(', '\n', '\020', 'p', 'h', 'p', '_', 'c', 'l', 'a', 's', -'s', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '(', ' ', '\001', '(', '\t', 'R', '\016', 'p', 'h', 'p', 'C', 'l', 'a', 's', 's', 'P', -'r', 'e', 'f', 'i', 'x', '\022', '#', '\n', '\r', 'p', 'h', 'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ')', ' ', -'\001', '(', '\t', 'R', '\014', 'p', 'h', 'p', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '4', '\n', '\026', 'p', 'h', 'p', '_', -'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ',', ' ', '\001', '(', '\t', 'R', -'\024', 'p', 'h', 'p', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', -'r', 'u', 'b', 'y', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '-', ' ', '\001', '(', '\t', 'R', '\013', 'r', 'u', 'b', 'y', 'P', -'a', 'c', 'k', 'a', 'g', 'e', '\022', '7', '\n', '\010', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\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', '\"', ':', '\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', '\'', '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', '.', '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', +'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', 'X', '\n', '\017', 'e', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', '/', '.', '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', '.', +'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'R', '\016', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\n', 'o', 'n', 'e', 'o', 'f', '_', 'd', 'e', 'c', 'l', '\030', '\010', ' ', '\003', '(', '\013', +'2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'D', +'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 'o', 'n', 'e', 'o', 'f', 'D', 'e', 'c', 'l', +'\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', +'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\016', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', +'g', 'e', '\030', '\t', ' ', '\003', '(', '\013', '2', '.', '.', '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', '.', 'R', 'e', 's', 'e', 'r', 'v', 'e', +'d', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', +'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', +'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', 'z', '\n', '\016', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', +'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', +'\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\022', '@', '\n', '\007', 'o', 'p', 't', 'i', 'o', +'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', +'o', 'p', 't', 'i', 'o', 'n', 's', '\032', '7', '\n', '\r', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', +'\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', +'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '\314', '\004', '\n', '\025', 'E', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', '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', '\204', '\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', '\204', '\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', '\204', '\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', '\204', '\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', '\204', '\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', '\204', '\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', +'p', 't', 'i', 'o', 'n', '\022', 'Y', '\n', '\013', 'd', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\003', '(', +'\013', '2', '2', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', +'s', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'D', 'e', 'c', 'l', 'a', 'r', 'a', 't', +'i', 'o', 'n', 'B', '\003', '\210', '\001', '\002', 'R', '\013', 'd', 'e', 'c', 'l', 'a', 'r', 'a', 't', 'i', 'o', 'n', '\022', '7', '\n', '\010', +'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\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', 'm', '\n', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', +'2', '8', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', +'i', 'o', 'n', 'S', 't', 'a', 't', 'e', ':', '\n', 'U', 'N', 'V', 'E', 'R', 'I', 'F', 'I', 'E', 'D', 'B', '\003', '\210', '\001', '\002', +'R', '\014', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\224', '\001', '\n', '\013', 'D', 'e', 'c', 'l', 'a', 'r', +'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', +'m', 'b', 'e', 'r', '\022', '\033', '\n', '\t', 'f', 'u', 'l', 'l', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', +'f', 'u', 'l', 'l', 'N', 'a', 'm', 'e', '\022', '\022', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 't', +'y', 'p', 'e', '\022', '\032', '\n', '\010', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', +'s', 'e', 'r', 'v', 'e', 'd', '\022', '\032', '\n', '\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', '\030', '\006', ' ', '\001', '(', '\010', 'R', +'\010', 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd', 'J', '\004', '\010', '\004', '\020', '\005', '\"', '4', '\n', '\021', 'V', 'e', 'r', 'i', 'f', 'i', +'c', 'a', 't', 'i', 'o', 'n', 'S', 't', 'a', 't', 'e', '\022', '\017', '\n', '\013', 'D', 'E', 'C', 'L', 'A', 'R', 'A', 'T', 'I', 'O', +'N', '\020', '\000', '\022', '\016', '\n', '\n', 'U', 'N', 'V', 'E', 'R', 'I', 'F', 'I', 'E', 'D', '\020', '\001', '*', '\t', '\010', '\350', '\007', '\020', +'\200', '\200', '\200', '\200', '\002', '\"', '\301', '\006', '\n', '\024', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', +'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', +'\022', '\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', +'A', '\n', '\005', 'l', 'a', 'b', 'e', 'l', '\030', '\004', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', +'o', 't', 'o', '.', 'L', 'a', 'b', 'e', 'l', 'R', '\005', 'l', 'a', 'b', 'e', 'l', '\022', '>', '\n', '\004', 't', 'y', 'p', 'e', '\030', +'\005', ' ', '\001', '(', '\016', '2', '*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', +'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'T', 'y', 'p', 'e', 'R', +'\004', 't', 'y', 'p', 'e', '\022', '\033', '\n', '\t', 't', 'y', 'p', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', +'\010', 't', 'y', 'p', 'e', 'N', 'a', 'm', 'e', '\022', '\032', '\n', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\030', '\002', ' ', '\001', +'(', '\t', 'R', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', +'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', +'\037', '\n', '\013', 'o', 'n', 'e', 'o', 'f', '_', 'i', 'n', 'd', 'e', 'x', '\030', '\t', ' ', '\001', '(', '\005', 'R', '\n', 'o', 'n', 'e', +'o', 'f', 'I', 'n', 'd', 'e', 'x', '\022', '\033', '\n', '\t', 'j', 's', 'o', 'n', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', '\001', '(', +'\t', 'R', '\010', 'j', 's', 'o', 'n', 'N', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\010', ' ', +'\001', '(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', +'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '\'', '\n', '\017', 'p', 'r', 'o', +'t', 'o', '3', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\021', ' ', '\001', '(', '\010', 'R', '\016', 'p', 'r', 'o', 't', 'o', +'3', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\"', '\266', '\002', '\n', '\004', 'T', 'y', 'p', 'e', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', +'E', '_', 'D', 'O', 'U', 'B', 'L', 'E', '\020', '\001', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'F', 'L', 'O', 'A', 'T', '\020', +'\002', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '6', '4', '\020', '\003', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', +'_', 'U', 'I', 'N', 'T', '6', '4', '\020', '\004', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '3', '2', '\020', '\005', +'\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\006', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', +'E', '_', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\007', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'B', 'O', 'O', 'L', '\020', +'\010', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\t', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', +'E', '_', 'G', 'R', 'O', 'U', 'P', '\020', '\n', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', +'\020', '\013', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'B', 'Y', 'T', 'E', 'S', '\020', '\014', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', +'E', '_', 'U', 'I', 'N', 'T', '3', '2', '\020', '\r', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\016', +'\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\017', '\022', '\021', '\n', '\r', 'T', 'Y', +'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\020', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', +'T', '3', '2', '\020', '\021', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '6', '4', '\020', '\022', '\"', 'C', '\n', +'\005', 'L', 'a', 'b', 'e', 'l', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'O', 'P', 'T', 'I', 'O', 'N', 'A', 'L', '\020', +'\001', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '\020', '\003', '\022', '\022', '\n', '\016', +'L', 'A', 'B', 'E', 'L', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\002', '\"', 'c', '\n', '\024', 'O', 'n', 'e', 'o', 'f', +'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', +' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001', +'(', '\013', '2', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', +'f', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\343', '\002', '\n', '\023', 'E', 'n', 'u', +'m', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', +'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '?', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\003', '(', +'\013', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', +'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\005', 'v', 'a', 'l', 'u', +'e', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', +'o', 'p', 't', 'i', 'o', 'n', 's', '\022', ']', '\n', '\016', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', +'\030', '\004', ' ', '\003', '(', '\013', '2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'E', 'n', 'u', 'm', 'R', +'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', +'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', '\005', ' ', '\003', '(', '\t', +'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', ';', '\n', '\021', 'E', 'n', 'u', 'm', 'R', 'e', 's', +'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', +'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', +'\"', '\203', '\001', '\n', '\030', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', +'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', +'\026', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', ';', +'\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', +'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\247', '\001', '\n', '\026', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 'c', +'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', +'R', '\004', 'n', 'a', 'm', 'e', '\022', '>', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\002', ' ', '\003', '(', '\013', '2', '&', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', +'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\022', '9', '\n', '\007', 'o', +'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', +'i', 'o', 'n', 's', '\"', '\211', '\002', '\n', '\025', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', +'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', +'\022', '\035', '\n', '\n', 'i', 'n', 'p', 'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\t', 'i', 'n', 'p', +'u', 't', 'T', 'y', 'p', 'e', '\022', '\037', '\n', '\013', 'o', 'u', 't', 'p', 'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001', +'(', '\t', 'R', '\n', 'o', 'u', 't', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '8', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', +'\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', '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', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '0', '\n', +'\020', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'r', 'e', 'a', 'm', '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', '\"', '\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', 'C', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\022', '5', +'\n', '\023', 'j', 'a', 'v', 'a', '_', 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', '_', 'f', 'i', 'l', 'e', 's', '\030', '\n', ' ', '\001', +'(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'j', 'a', 'v', 'a', 'M', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'F', 'i', +'l', 'e', 's', '\022', 'D', '\n', '\035', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'a', 't', 'e', '_', 'e', 'q', 'u', 'a', +'l', 's', '_', 'a', 'n', 'd', '_', 'h', 'a', 's', 'h', '\030', '\024', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\031', 'j', 'a', +'v', 'a', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'E', 'q', 'u', 'a', 'l', 's', 'A', 'n', 'd', 'H', 'a', 's', 'h', '\022', ':', +'\n', '\026', 'j', 'a', 'v', 'a', '_', 's', 't', 'r', 'i', 'n', 'g', '_', 'c', 'h', 'e', 'c', 'k', '_', 'u', 't', 'f', '8', '\030', +'\033', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'S', 't', 'r', 'i', 'n', 'g', 'C', +'h', 'e', 'c', 'k', 'U', 't', 'f', '8', '\022', 'S', '\n', '\014', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', '_', 'f', 'o', 'r', '\030', +'\t', ' ', '\001', '(', '\016', '2', ')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', +'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', ':', '\005', +'S', 'P', 'E', 'E', 'D', 'R', '\013', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'g', 'o', '_', +'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\t', 'g', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', +'5', '\n', '\023', 'c', 'c', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\020', ' ', +'\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'c', 'c', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', +'i', 'c', 'e', 's', '\022', '9', '\n', '\025', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', +'i', 'c', 'e', 's', '\030', '\021', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'G', 'e', +'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '5', '\n', '\023', 'p', 'y', '_', 'g', 'e', 'n', 'e', 'r', +'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\022', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', +'\021', 'p', 'y', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', +'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\027', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', +'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '.', '\n', '\020', 'c', 'c', '_', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'a', 'r', 'e', 'n', +'a', 's', '\030', '\037', ' ', '\001', '(', '\010', ':', '\004', 't', 'r', 'u', 'e', 'R', '\016', 'c', 'c', 'E', 'n', 'a', 'b', 'l', 'e', 'A', +'r', 'e', 'n', 'a', 's', '\022', '*', '\n', '\021', 'o', 'b', 'j', 'c', '_', 'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', +'x', '\030', '$', ' ', '\001', '(', '\t', 'R', '\017', 'o', 'b', 'j', 'c', 'C', 'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022', +')', '\n', '\020', 'c', 's', 'h', 'a', 'r', 'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', '%', ' ', '\001', '(', '\t', +'R', '\017', 'c', 's', 'h', 'a', 'r', 'p', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', 's', 'w', 'i', 'f', +'t', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\'', ' ', '\001', '(', '\t', 'R', '\013', 's', 'w', 'i', 'f', 't', 'P', 'r', 'e', 'f', +'i', 'x', '\022', '(', '\n', '\020', 'p', 'h', 'p', '_', 'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '(', ' ', +'\001', '(', '\t', 'R', '\016', 'p', 'h', 'p', 'C', 'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '#', '\n', '\r', 'p', 'h', +'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ')', ' ', '\001', '(', '\t', 'R', '\014', 'p', 'h', 'p', 'N', 'a', 'm', +'e', 's', 'p', 'a', 'c', 'e', '\022', '4', '\n', '\026', 'p', 'h', 'p', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'n', 'a', +'m', 'e', 's', 'p', 'a', 'c', 'e', '\030', ',', ' ', '\001', '(', '\t', 'R', '\024', 'p', 'h', 'p', 'M', 'e', 't', 'a', 'd', 'a', 't', +'a', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', 'r', 'u', 'b', 'y', '_', 'p', 'a', 'c', 'k', 'a', 'g', +'e', '\030', '-', ' ', '\001', '(', '\t', 'R', '\013', 'r', 'u', 'b', 'y', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '7', '\n', '\010', 'f', +'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '2', ' ', '\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', '\"', ':', '\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', '\'', +'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', '.', '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', '\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', +'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', '\204', '\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', '\204', '\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', '\204', '\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', '\204', '\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', '\204', '\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', '\204', '\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', +'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', '\"', '\265', '\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', '*', '\014', '\010', '\200', '\354', '\312', '\377', '\001', +'\020', '\201', '\354', '\312', '\377', '\001', '\"', '\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] = { @@ -511,5 +512,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, 12268) + UPB_STRINGVIEW_INIT(descriptor, 12296) }; 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 4636f5b649..02414587a3 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/descriptor.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ -#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -190,4 +190,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_GeneratedCodeInfo_Annotation_ge #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h index 5e3cba41f9..6743e8a046 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/duration.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_ -#define GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_Duration_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_PROTOBUF_DURATION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h index 69eccefe87..6b54cbce97 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/empty.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_ -#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_Empty_getmsgdef(upb_DefPool *s) #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_PROTOBUF_EMPTY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h index 887da56be7..b8a6518e70 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/struct.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_ -#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_ListValue_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_PROTOBUF_STRUCT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h index ba9e2920ad..3acd215c91 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/timestamp.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_ -#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_Timestamp_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_PROTOBUF_TIMESTAMP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h index 310247c946..03b213600d 100644 --- a/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/protobuf/wrappers.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_ -#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -70,4 +70,4 @@ UPB_INLINE const upb_MessageDef *google_protobuf_BytesValue_getmsgdef(upb_DefPoo #include "upb/port/undef.inc" -#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_PROTOBUF_WRAPPERS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h index 2dd25f9d20..346a141348 100644 --- a/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h +++ b/src/core/ext/upbdefs-gen/google/rpc/status.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_ -#define GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_ +#ifndef GOOGLE_RPC_STATUS_PROTO_UPB_H__UPBDEFS_H_ +#define GOOGLE_RPC_STATUS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *google_rpc_Status_getmsgdef(upb_DefPool *s) { #include "upb/port/undef.inc" -#endif /* GOOGLE_RPC_STATUS_PROTO_UPBDEFS_H_ */ +#endif /* GOOGLE_RPC_STATUS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h index 18f71d42ee..b3dde7ab14 100644 --- a/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/opencensus/proto/trace/v1/trace_config.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_ -#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_ +#ifndef OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPBDEFS_H_ +#define OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *opencensus_proto_trace_v1_RateLimitingSampler_g #include "upb/port/undef.inc" -#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPBDEFS_H_ */ +#endif /* OPENCENSUS_PROTO_TRACE_V1_TRACE_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h index f3121fc516..16458a64df 100644 --- a/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h +++ b/src/core/ext/upbdefs-gen/src/proto/grpc/lookup/v1/rls_config.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_ -#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_ +#ifndef SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPBDEFS_H_ +#define SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -70,4 +70,4 @@ UPB_INLINE const upb_MessageDef *grpc_lookup_v1_RouteLookupClusterSpecifier_getm #include "upb/port/undef.inc" -#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPBDEFS_H_ */ +#endif /* SRC_PROTO_GRPC_LOOKUP_V1_RLS_CONFIG_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h index bc7e16bf23..a91f76f144 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/migrate.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_ -#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_ +#ifndef UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPBDEFS_H_ +#define UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *udpa_annotations_FileMigrateAnnotation_getmsgde #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPBDEFS_H_ */ +#endif /* UDPA_ANNOTATIONS_MIGRATE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h index f9e5c9580d..089b5e96e0 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/security.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_ -#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_ +#ifndef UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPBDEFS_H_ +#define UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *udpa_annotations_FieldSecurityAnnotation_getmsg #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPBDEFS_H_ */ +#endif /* UDPA_ANNOTATIONS_SECURITY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h index 27f1dc4538..f35f083f75 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/sensitive.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_ -#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_ +#ifndef UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_ +#define UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -25,4 +25,4 @@ extern _upb_DefPool_Init udpa_annotations_sensitive_proto_upbdefinit; #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPBDEFS_H_ */ +#endif /* UDPA_ANNOTATIONS_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h index fdea4a7c40..163627d711 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/status.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_ -#define UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_ +#ifndef UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPBDEFS_H_ +#define UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *udpa_annotations_StatusAnnotation_getmsgdef(upb #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPBDEFS_H_ */ +#endif /* UDPA_ANNOTATIONS_STATUS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h index 36f9b90dbe..47b26cfa1a 100644 --- a/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h +++ b/src/core/ext/upbdefs-gen/udpa/annotations/versioning.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_ -#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_ +#ifndef UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPBDEFS_H_ +#define UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *udpa_annotations_VersioningAnnotation_getmsgdef #include "upb/port/undef.inc" -#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPBDEFS_H_ */ +#endif /* UDPA_ANNOTATIONS_VERSIONING_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h index 5028ab2071..afe2383041 100644 --- a/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h +++ b/src/core/ext/upbdefs-gen/validate/validate.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef VALIDATE_VALIDATE_PROTO_UPBDEFS_H_ -#define VALIDATE_VALIDATE_PROTO_UPBDEFS_H_ +#ifndef VALIDATE_VALIDATE_PROTO_UPB_H__UPBDEFS_H_ +#define VALIDATE_VALIDATE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -140,4 +140,4 @@ UPB_INLINE const upb_MessageDef *validate_TimestampRules_getmsgdef(upb_DefPool * #include "upb/port/undef.inc" -#endif /* VALIDATE_VALIDATE_PROTO_UPBDEFS_H_ */ +#endif /* VALIDATE_VALIDATE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h index 2295609ede..2f6053f702 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/migrate.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_ -#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_ +#ifndef XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *xds_annotations_v3_FileMigrateAnnotation_getmsg #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPBDEFS_H_ */ +#endif /* XDS_ANNOTATIONS_V3_MIGRATE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h index 3722cc1953..0e63a877d3 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/security.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_ -#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_ +#ifndef XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_annotations_v3_FieldSecurityAnnotation_getm #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPBDEFS_H_ */ +#endif /* XDS_ANNOTATIONS_V3_SECURITY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h index 68f4870a61..eaa10bf683 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/sensitive.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_ -#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_ +#ifndef XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -25,4 +25,4 @@ extern _upb_DefPool_Init xds_annotations_v3_sensitive_proto_upbdefinit; #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPBDEFS_H_ */ +#endif /* XDS_ANNOTATIONS_V3_SENSITIVE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h index 098db82705..e545a68565 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/status.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_ -#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_ +#ifndef XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -45,4 +45,4 @@ UPB_INLINE const upb_MessageDef *xds_annotations_v3_StatusAnnotation_getmsgdef(u #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPBDEFS_H_ */ +#endif /* XDS_ANNOTATIONS_V3_STATUS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h index 63f26c1d34..1253c730d6 100644 --- a/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/annotations/v3/versioning.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_ -#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_ +#ifndef XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_annotations_v3_VersioningAnnotation_getmsgd #include "upb/port/undef.inc" -#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPBDEFS_H_ */ +#endif /* XDS_ANNOTATIONS_V3_VERSIONING_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h index 55100cb16c..76c1e3060a 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/authority.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ -#define XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ +#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_Authority_getmsgdef(upb_DefPool *s) #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ */ +#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h index 592c10c618..97c527270a 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/cidr.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_ -#define XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_ +#ifndef XDS_CORE_V3_CIDR_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_CORE_V3_CIDR_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_CidrRange_getmsgdef(upb_DefPool *s) #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_CIDR_PROTO_UPBDEFS_H_ */ +#endif /* XDS_CORE_V3_CIDR_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h index 10db1bfaca..4f3607b54c 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/collection_entry.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ -#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ +#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_CollectionEntry_InlineEntry_getmsgd #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ */ +#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h index 8390a911ee..833e084349 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/context_params.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ -#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ +#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_ContextParams_ParamsEntry_getmsgdef #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ */ +#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h index eeda9b711e..1ce988907c 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/extension.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ -#define XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ +#ifndef XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_TypedExtensionConfig_getmsgdef(upb_ #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPBDEFS_H_ */ +#endif /* XDS_CORE_V3_EXTENSION_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h index 4beca8e3ed..cdd7bc5cbe 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ -#define XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ +#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_Resource_getmsgdef(upb_DefPool *s) #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h index 1f45931d9c..dc43f98781 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_locator.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ -#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ +#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_ResourceLocator_Directive_getmsgdef #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h index 28bebb0e5f..019b946ccb 100644 --- a/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/core/v3/resource_name.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ -#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ +#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_core_v3_ResourceName_getmsgdef(upb_DefPool #include "upb/port/undef.inc" -#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ */ +#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h index 8c19401d8e..9fd606f5c1 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/cel.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_ -#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_CelMatcher_getmsgdef(upb_De #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h index 682614796a..390cd0ec89 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/domain.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_ -#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_ServerNameMatcher_DomainMat #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_DOMAIN_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h index 8bbd630a05..aa89b4517b 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/http_inputs.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ -#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_HttpAttributesCelMatchInput #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_HTTP_INPUTS_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h index 80dfb5fcb2..4772d3247a 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/ip.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_ -#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_IPMatcher_IPRangeMatcher_ge #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_IP_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h index 9e0f78a9eb..389cebb5f6 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/matcher.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ -#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -75,4 +75,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_Matcher_MatcherTree_MatchMa #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_MATCHER_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h index 56615f248b..bc3a84c93a 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/range.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ -#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -55,4 +55,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_DoubleRangeMatcher_RangeMat #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h index 54c68cc08f..d9a5740e72 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/regex.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ -#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_RegexMatcher_GoogleRE2_getm #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_REGEX_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h index aba5339ea3..2652fd7349 100644 --- a/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/matcher/v3/string.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ -#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_matcher_v3_ListStringMatcher_getmsgdef #include "upb/port/undef.inc" -#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_MATCHER_V3_STRING_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h index 725e8510cb..0726c4461c 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ -#define XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -35,4 +35,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_CelExtractString_getmsgdef(upb_DefP #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_CEL_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_V3_CEL_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h index 7cde07bea6..cc589ef8d8 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ -#define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -40,4 +40,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_DoubleRange_getmsgdef(upb_DefPool * #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_V3_RANGE_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h index 68948ea951..b1f48d5eb7 100644 --- a/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h +++ b/src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h @@ -6,8 +6,8 @@ * regenerated. * NO CHECKED-IN PROTOBUF GENCODE */ -#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ -#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ +#ifndef XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_ +#define XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_ #include "upb/reflection/def.h" #include "upb/reflection/internal/def_pool.h" @@ -30,4 +30,4 @@ UPB_INLINE const upb_MessageDef *xds_type_v3_TypedStruct_getmsgdef(upb_DefPool * #include "upb/port/undef.inc" -#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPBDEFS_H_ */ +#endif /* XDS_TYPE_V3_TYPED_STRUCT_PROTO_UPB_H__UPBDEFS_H_ */ diff --git a/src/core/filter/filter_args.h b/src/core/filter/filter_args.h new file mode 100644 index 0000000000..efdbf0829b --- /dev/null +++ b/src/core/filter/filter_args.h @@ -0,0 +1,112 @@ +// 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_FILTER_FILTER_ARGS_H +#define GRPC_SRC_CORE_FILTER_FILTER_ARGS_H + +#include "src/core/filter/blackboard.h" +#include "src/core/lib/channel/channel_fwd.h" +#include "src/core/util/match.h" + +namespace grpc_core { + +// Filter arguments that are independent of channel args. +// Here-in should be things that depend on the filters location in the stack, or +// things that are ephemeral and disjoint from overall channel args. +class FilterArgs { + public: + FilterArgs() : FilterArgs(nullptr, nullptr, nullptr) {} + FilterArgs(grpc_channel_stack* channel_stack, + grpc_channel_element* channel_element, + size_t (*channel_stack_filter_instance_number)( + grpc_channel_stack*, grpc_channel_element*), + const Blackboard* old_blackboard = nullptr, + Blackboard* new_blackboard = nullptr) + : impl_(ChannelStackBased{channel_stack, channel_element, + channel_stack_filter_instance_number}), + old_blackboard_(old_blackboard), + new_blackboard_(new_blackboard) {} + // While we're moving to call-v3 we need to have access to + // grpc_channel_stack & friends here. That means that we can't rely on this + // type signature from interception_chain.h, which means that we need a way + // of constructing this object without naming it ===> implicit construction. + // TODO(ctiller): remove this once we're fully on call-v3 + // NOLINTNEXTLINE(google-explicit-constructor) + FilterArgs(size_t instance_id, const Blackboard* old_blackboard = nullptr, + Blackboard* new_blackboard = nullptr) + : impl_(V3Based{instance_id}), + old_blackboard_(old_blackboard), + new_blackboard_(new_blackboard) {} + + ABSL_DEPRECATED("Direct access to channel stack is deprecated") + grpc_channel_stack* channel_stack() const { + return absl::get(impl_).channel_stack; + } + + // Get the instance id of this filter. + // This id is unique amongst all filters /of the same type/ and densely + // packed (starting at 0) for a given channel stack instantiation. + // eg. for a stack with filter types A B C A B D A the instance ids would be + // 0 0 0 1 1 0 2. + // This is useful for filters that need to store per-instance data in a + // parallel data structure. + size_t instance_id() const { + return Match( + impl_, + [](const ChannelStackBased& cs) { + return cs.channel_stack_filter_instance_number(cs.channel_stack, + cs.channel_element); + }, + [](const V3Based& v3) { return v3.instance_id; }); + } + + // If a filter state object of type T exists for key from a previous + // filter stack, retains it for the new filter stack we're constructing. + // Otherwise, invokes create_func() to create a new filter state + // object for the new filter stack. Returns the new filter state object. + template + RefCountedPtr GetOrCreateState( + const std::string& key, + absl::FunctionRef()> create_func) { + RefCountedPtr state; + if (old_blackboard_ != nullptr) state = old_blackboard_->Get(key); + if (state == nullptr) state = create_func(); + if (new_blackboard_ != nullptr) new_blackboard_->Set(key, state); + return state; + } + + private: + friend class ChannelFilter; + + struct ChannelStackBased { + grpc_channel_stack* channel_stack; + grpc_channel_element* channel_element; + size_t (*channel_stack_filter_instance_number)(grpc_channel_stack*, + grpc_channel_element*); + }; + + struct V3Based { + size_t instance_id; + }; + + using Impl = absl::variant; + Impl impl_; + + const Blackboard* old_blackboard_ = nullptr; + Blackboard* new_blackboard_ = nullptr; +}; + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_FILTER_FILTER_ARGS_H diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h index a45105a62b..d64253abaf 100644 --- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h +++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.h @@ -19,7 +19,7 @@ #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" // Set by the handshaker to indicate the local address of the endpoint. #define GRPC_ARG_ENDPOINT_LOCAL_ADDRESS "grpc.internal.endpoint_local_address" diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc index 68ca9ab73c..fe3766c49b 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.cc +++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc @@ -35,11 +35,11 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" @@ -107,6 +107,12 @@ void HttpConnectHandshaker::HandshakeFailedLocked(absl::Status error) { // own error. error = GRPC_ERROR_CREATE("Handshaker shutdown"); } + absl::string_view peer_string = "[unknown]"; + if (args_ != nullptr && args_->endpoint != nullptr) { + peer_string = grpc_endpoint_get_peer(args_->endpoint.get()); + } + LOG_EVERY_N_SEC(ERROR, 1) + << "HTTP proxy handshake with " << peer_string << " failed: " << error; // Invoke callback. FinishLocked(std::move(error)); } diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.h b/src/core/handshaker/http_connect/http_connect_handshaker.h index 6d2fc0aed6..286d0c6631 100644 --- a/src/core/handshaker/http_connect/http_connect_handshaker.h +++ b/src/core/handshaker/http_connect/http_connect_handshaker.h @@ -21,7 +21,7 @@ #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" /// Channel arg indicating the server in HTTP CONNECT request (string). /// The presence of this arg triggers the use of HTTP CONNECT. diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.h b/src/core/handshaker/http_connect/http_proxy_mapper.h index 50fb2919c9..6beaa72137 100644 --- a/src/core/handshaker/http_connect/http_proxy_mapper.h +++ b/src/core/handshaker/http_connect/http_proxy_mapper.h @@ -25,9 +25,9 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/handshaker/proxy_mapper.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/resolved_address.h" namespace grpc_core { diff --git a/src/core/handshaker/http_connect/xds_http_proxy_mapper.cc b/src/core/handshaker/http_connect/xds_http_proxy_mapper.cc new file mode 100644 index 0000000000..8762711225 --- /dev/null +++ b/src/core/handshaker/http_connect/xds_http_proxy_mapper.cc @@ -0,0 +1,57 @@ +// +// 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/handshaker/http_connect/xds_http_proxy_mapper.h" + +#include +#include + +#include "absl/log/log.h" +#include "absl/types/optional.h" +#include "src/core/handshaker/http_connect/http_connect_handshaker.h" +#include "src/core/lib/address_utils/parse_address.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/xds/grpc/xds_endpoint.h" + +namespace grpc_core { + +absl::optional XdsHttpProxyMapper::MapAddress( + const grpc_resolved_address& endpoint_address, ChannelArgs* args) { + auto proxy_address_str = args->GetString(GRPC_ARG_XDS_HTTP_PROXY); + if (!proxy_address_str.has_value()) return absl::nullopt; + auto proxy_address = StringToSockaddr(*proxy_address_str); + if (!proxy_address.ok()) { + LOG(ERROR) << "error parsing address \"" << *proxy_address_str + << "\": " << proxy_address.status(); + return absl::nullopt; + } + auto endpoint_address_str = grpc_sockaddr_to_string(&endpoint_address, true); + if (!endpoint_address_str.ok()) { + LOG(ERROR) << "error converting address to string: " + << endpoint_address_str.status(); + return absl::nullopt; + } + *args = args->Set(GRPC_ARG_HTTP_CONNECT_SERVER, *endpoint_address_str); + return *proxy_address; +} + +void RegisterXdsHttpProxyMapper(CoreConfiguration::Builder* builder) { + builder->proxy_mapper_registry()->Register( + /*at_start=*/true, std::make_unique()); +} + +} // namespace grpc_core diff --git a/src/core/handshaker/http_connect/xds_http_proxy_mapper.h b/src/core/handshaker/http_connect/xds_http_proxy_mapper.h new file mode 100644 index 0000000000..bff3c6f275 --- /dev/null +++ b/src/core/handshaker/http_connect/xds_http_proxy_mapper.h @@ -0,0 +1,46 @@ +// +// 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_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H +#define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H + +#include + +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" +#include "src/core/handshaker/proxy_mapper.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/iomgr/resolved_address.h" + +namespace grpc_core { + +class XdsHttpProxyMapper final : public ProxyMapperInterface { + public: + absl::optional MapName(absl::string_view /*server_uri*/, + ChannelArgs* /*args*/) override { + return absl::nullopt; + } + + absl::optional MapAddress( + const grpc_resolved_address& address, ChannelArgs* args) override; +}; + +void RegisterXdsHttpProxyMapper(CoreConfiguration::Builder* builder); + +} // namespace grpc_core + +#endif // GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index 1e1102846d..f6d9266a9a 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -42,12 +42,12 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "src/core/channelz/channelz.h" +#include "src/core/config/core_configuration.h" #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" #include "src/core/handshaker/security/secure_endpoint.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h index 23c10b94fa..f1f8d7088c 100644 --- a/src/core/handshaker/security/security_handshaker.h +++ b/src/core/handshaker/security/security_handshaker.h @@ -23,9 +23,9 @@ #include #include "absl/status/statusor.h" +#include "src/core/config/core_configuration.h" #include "src/core/handshaker/handshaker.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/transport_security_interface.h" #include "src/core/util/ref_counted_ptr.h" diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc index 8dd1ff89d4..32584b5871 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc @@ -32,12 +32,12 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/handshaker/handshaker.h" #include "src/core/handshaker/handshaker_factory.h" #include "src/core/handshaker/handshaker_registry.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h index 94e05bdc81..44293941e7 100644 --- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h +++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.h @@ -19,7 +19,7 @@ #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" // Indicates the address that the tcp connect handshaker should connect to. #define GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS \ diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index 9a49c3dd3f..8b7140fed0 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -677,7 +677,7 @@ typedef grpc_core::ChannelArgs ( const char* target, const grpc_core::ChannelArgs& old_args, grpc_channel_stack_type type); -// Should be called only once globaly before grpc is init'ed. +// Should be called only once globally before grpc is init'ed. void grpc_channel_args_set_client_channel_creation_mutator( grpc_channel_args_client_channel_creation_mutator cb); // This will be called at the creation of each channel. diff --git a/src/core/lib/channel/channel_args_preconditioning.h b/src/core/lib/channel/channel_args_preconditioning.h index ff4b43fc54..b83f6f5f4e 100644 --- a/src/core/lib/channel/channel_args_preconditioning.h +++ b/src/core/lib/channel/channel_args_preconditioning.h @@ -27,7 +27,7 @@ namespace grpc_core { // Registry of mutators for channel args. // Surface APIs should call into this with channel args received from outside -// of gRPC, in order to prepare those channel args for the expections of the +// of gRPC, in order to prepare those channel args for the expectations of the // gRPC internals. class ChannelArgsPreconditioning { public: diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc index 6f8b1bb291..633f80698a 100644 --- a/src/core/lib/channel/connected_channel.cc +++ b/src/core/lib/channel/connected_channel.cc @@ -34,11 +34,11 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/optional.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/iomgr/call_combiner.h" diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc index 4488a56b68..04ff6aaf25 100644 --- a/src/core/lib/channel/promise_based_filter.cc +++ b/src/core/lib/channel/promise_based_filter.cc @@ -2236,7 +2236,7 @@ ArenaPromise ServerCallData::MakeNextPromise( } // Wrapper to make it look like we're calling the next filter as a promise. -// All polls: await sending the trailing metadata, then foward it down the +// All polls: await sending the trailing metadata, then forward it down the // stack. Poll ServerCallData::PollTrailingMetadata() { GRPC_TRACE_LOG(channel, INFO) diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h index d18809dca6..0a3b7ea009 100644 --- a/src/core/lib/channel/promise_based_filter.h +++ b/src/core/lib/channel/promise_based_filter.h @@ -41,6 +41,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "src/core/filter/blackboard.h" +#include "src/core/filter/filter_args.h" #include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" @@ -76,83 +77,7 @@ namespace grpc_core { class ChannelFilter { public: - class Args { - public: - Args() : Args(nullptr, nullptr) {} - Args(grpc_channel_stack* channel_stack, - grpc_channel_element* channel_element, - const Blackboard* old_blackboard = nullptr, - Blackboard* new_blackboard = nullptr) - : impl_(ChannelStackBased{channel_stack, channel_element}), - old_blackboard_(old_blackboard), - new_blackboard_(new_blackboard) {} - // While we're moving to call-v3 we need to have access to - // grpc_channel_stack & friends here. That means that we can't rely on this - // type signature from interception_chain.h, which means that we need a way - // of constructing this object without naming it ===> implicit construction. - // TODO(ctiller): remove this once we're fully on call-v3 - // NOLINTNEXTLINE(google-explicit-constructor) - Args(size_t instance_id, const Blackboard* old_blackboard = nullptr, - Blackboard* new_blackboard = nullptr) - : impl_(V3Based{instance_id}), - old_blackboard_(old_blackboard), - new_blackboard_(new_blackboard) {} - - ABSL_DEPRECATED("Direct access to channel stack is deprecated") - grpc_channel_stack* channel_stack() const { - return absl::get(impl_).channel_stack; - } - - // Get the instance id of this filter. - // This id is unique amongst all filters /of the same type/ and densely - // packed (starting at 0) for a given channel stack instantiation. - // eg. for a stack with filter types A B C A B D A the instance ids would be - // 0 0 0 1 1 0 2. - // This is useful for filters that need to store per-instance data in a - // parallel data structure. - size_t instance_id() const { - return Match( - impl_, - [](const ChannelStackBased& cs) { - return grpc_channel_stack_filter_instance_number( - cs.channel_stack, cs.channel_element); - }, - [](const V3Based& v3) { return v3.instance_id; }); - } - - // If a filter state object of type T exists for key from a previous - // filter stack, retains it for the new filter stack we're constructing. - // Otherwise, invokes create_func() to create a new filter state - // object for the new filter stack. Returns the new filter state object. - template - RefCountedPtr GetOrCreateState( - const std::string& key, - absl::FunctionRef()> create_func) { - RefCountedPtr state; - if (old_blackboard_ != nullptr) state = old_blackboard_->Get(key); - if (state == nullptr) state = create_func(); - if (new_blackboard_ != nullptr) new_blackboard_->Set(key, state); - return state; - } - - private: - friend class ChannelFilter; - - struct ChannelStackBased { - grpc_channel_stack* channel_stack; - grpc_channel_element* channel_element; - }; - - struct V3Based { - size_t instance_id; - }; - - using Impl = absl::variant; - Impl impl_; - - const Blackboard* old_blackboard_ = nullptr; - Blackboard* new_blackboard_ = nullptr; - }; + using Args = FilterArgs; // Perform post-initialization step (if any). virtual void PostInit() {} @@ -179,7 +104,7 @@ class ChannelFilter { namespace promise_filter_detail { -// Determine if a list of interceptors has any that need to asyncronously error +// Determine if a list of interceptors has any that need to asynchronously error // the promise. If so, we need to allocate a latch for the generated promise for // the original promise stack polyfill code that's generated. @@ -1502,7 +1427,7 @@ class ServerCallData : public BaseCallData { // - return a wrapper around PollTrailingMetadata as the promise. ArenaPromise MakeNextPromise(CallArgs call_args); // Wrapper to make it look like we're calling the next filter as a promise. - // All polls: await sending the trailing metadata, then foward it down the + // All polls: await sending the trailing metadata, then forward it down the // stack. Poll PollTrailingMetadata(); static void RecvInitialMetadataReadyCallback(void* arg, @@ -1649,8 +1574,9 @@ struct ChannelFilterWithFlagsMethods { CHECK(args->is_last == ((kFlags & kFilterIsLast) != 0)); auto status = F::Create( args->channel_args, - ChannelFilter::Args(args->channel_stack, elem, args->old_blackboard, - args->new_blackboard)); + ChannelFilter::Args(args->channel_stack, elem, + grpc_channel_stack_filter_instance_number, + args->old_blackboard, args->new_blackboard)); if (!status.ok()) { new (elem->channel_data) F*(nullptr); return absl_status_to_grpc_error(status.status()); diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc index 3eb004ec23..bd4a81b8ff 100644 --- a/src/core/lib/debug/trace.cc +++ b/src/core/lib/debug/trace.cc @@ -31,7 +31,7 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/util/glob.h" int grpc_tracer_set_enabled(const char* name, int enabled); diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index 1d38e9b827..a146acfa50 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -60,9 +60,9 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/types/optional.h" +#include "src/core/config/config_vars.h" #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" @@ -834,7 +834,6 @@ bool ShouldUseAresDnsResolver() { 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. @@ -850,7 +849,6 @@ absl::Status AresInit() { } 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. 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 c75b62b8f9..7ece5d34a6 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 @@ -143,7 +143,7 @@ void DNSServiceResolverImpl::ResolveCallback( << ", this: " << context; // no need to increase refcount here, since ResolveCallback and Shutdown is - // called from the serial queue and it is guarenteed that it won't be called + // called from the serial queue and it is guaranteed that it won't be called // after the sdRef is deallocated auto that = static_cast(context); @@ -221,8 +221,12 @@ void DNSServiceResolverImpl::Shutdown() { dispatch_async_f(queue_, Ref().release(), [](void* thatPtr) { grpc_core::RefCountedPtr that{ static_cast(thatPtr)}; - grpc_core::MutexLock lock(&that->request_mu_); - for (auto& kv : that->requests_) { + + grpc_core::ReleasableMutexLock lock(&that->request_mu_); + auto requests = std::exchange(that->requests_, {}); + lock.Release(); + + for (auto& kv : requests) { auto& sdRef = kv.first; auto& request = kv.second; GRPC_TRACE_LOG(event_engine_dns, INFO) @@ -232,7 +236,6 @@ void DNSServiceResolverImpl::Shutdown() { absl::CancelledError("DNSServiceResolverImpl::Shutdown")); DNSServiceRefDeallocate(static_cast(sdRef)); } - that->requests_.clear(); }); } diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc index 7b005d02d8..0d5372598f 100644 --- a/src/core/lib/event_engine/default_event_engine.cc +++ b/src/core/lib/event_engine/default_event_engine.cc @@ -21,8 +21,8 @@ #include #include "absl/functional/any_invocable.h" +#include "src/core/config/core_configuration.h" #include "src/core/lib/channel/channel_args.h" -#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/util/debug_location.h" diff --git a/src/core/lib/event_engine/default_event_engine.h b/src/core/lib/event_engine/default_event_engine.h index 2a254d4958..8f6a140c1c 100644 --- a/src/core/lib/event_engine/default_event_engine.h +++ b/src/core/lib/event_engine/default_event_engine.h @@ -20,7 +20,7 @@ #include -#include "src/core/lib/config/core_configuration.h" +#include "src/core/config/core_configuration.h" #include "src/core/util/debug_location.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/extensions/supports_fd.h b/src/core/lib/event_engine/extensions/supports_fd.h index c7a1bfdcd4..070bce175d 100644 --- a/src/core/lib/event_engine/extensions/supports_fd.h +++ b/src/core/lib/event_engine/extensions/supports_fd.h @@ -119,6 +119,23 @@ class EventEngineSupportsFdExtension { virtual std::unique_ptr CreateEndpointFromFd( int fd, const EndpointConfig& config) = 0; + /// Creates an EventEngine::Endpoint from a file descriptor that is configured + /// and bound locally but not yet connected to a remote peer. Returns a + /// connection handle to cancel the connection attempt if needed. Created + /// endpoint will be returned through `on_connect` callback. + /// \a fd - The socket file descriptor. + /// \a on_connect - The callback to invoke once fd is connected to peer. + /// \a addr - The remote peer to connect to. This should be the mapped peer + /// address returned when creating a new socket. + /// \a config - Additional configuration to be applied to the endpoint. + /// \a memory_allocator - The endpoint may use the provided memory allocator + /// to track memory allocations. + /// \a timeout - The timeout to use for the connection attempt. + virtual EventEngine::ConnectionHandle CreateEndpointFromUnconnectedFd( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, const EndpointConfig& config, + MemoryAllocator memory_allocator, EventEngine::Duration timeout) = 0; + /// Called when the posix listener has accepted a new client connection. /// \a listener_fd - The listening socket fd that accepted the new client /// connection. diff --git a/src/core/lib/event_engine/forkable.cc b/src/core/lib/event_engine/forkable.cc index e83c8105de..09a48f06d0 100644 --- a/src/core/lib/event_engine/forkable.cc +++ b/src/core/lib/event_engine/forkable.cc @@ -26,7 +26,7 @@ #include #include -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/debug/trace.h" namespace grpc_event_engine { diff --git a/src/core/lib/event_engine/nameser.h b/src/core/lib/event_engine/nameser.h index c73a91622d..733c94b951 100644 --- a/src/core/lib/event_engine/nameser.h +++ b/src/core/lib/event_engine/nameser.h @@ -78,7 +78,7 @@ typedef enum __ns_type { ns_t_cert = 37, // Certification record ns_t_a6 = 38, // IPv6 address (deprecates AAAA) ns_t_dname = 39, // Non-terminal DNAME (for IPv6) - ns_t_sink = 40, // Kitchen sink (experimentatl) + ns_t_sink = 40, // Kitchen sink (experimental) ns_t_opt = 41, // EDNS0 option (meta-RR) ns_t_apl = 42, // Address prefix list (RFC3123) ns_t_ds = 43, // Delegation Signer (RFC4034) 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 e8abcaf471..17e158ae35 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,7 @@ Epoll1Poller::Epoll1Poller(Scheduler* scheduler) CHECK_GE(g_epoll_set_.epfd, 0); GRPC_TRACE_LOG(event_engine_poller, INFO) << "grpc epoll fd: " << g_epoll_set_.epfd; - struct epoll_event ev {}; + struct epoll_event ev{}; ev.events = static_cast(EPOLLIN | EPOLLET); ev.data.ptr = wakeup_fd_.get(); CHECK(epoll_ctl(g_epoll_set_.epfd, EPOLL_CTL_ADD, wakeup_fd_->ReadFd(), diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc index 9bc6ba2755..b18eb2ee25 100644 --- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc +++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc @@ -376,7 +376,7 @@ void PollEventHandle::OrphanHandle(PosixEngineClosure* on_done, int* release_fd, if (!IsWatched()) { CloseFd(); } else { - // It is watched i.e we cannot take action wihout breaking from the + // It is watched i.e we cannot take action without breaking from the // blocking poll. Mark it as Unwatched and kick the thread executing // Work(...). That thread should proceed with the cleanup. SetWatched(-1); @@ -447,7 +447,7 @@ void PollEventHandle::ShutdownHandle(absl::Status why) { SetReadyLocked(&write_closure_); } } - // For the Ref() taken at the begining of this function. + // For the Ref() taken at the beginning of this function. Unref(); } @@ -469,7 +469,7 @@ void PollEventHandle::NotifyOnRead(PosixEngineClosure* on_read) { poller_->KickExternal(false); } } - // For the Ref() taken at the begining of this function. + // For the Ref() taken at the beginning of this function. Unref(); } @@ -491,7 +491,7 @@ void PollEventHandle::NotifyOnWrite(PosixEngineClosure* on_write) { poller_->KickExternal(false); } } - // For the Ref() taken at the begining of this function. + // For the Ref() taken at the beginning of this function. Unref(); } diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc index 7d22bcaf50..8b0d08b2c4 100644 --- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc +++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc @@ -19,7 +19,7 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/event_engine/forkable.h" #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h" #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h" 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 ab1e61fbf6..a60fcee28f 100644 --- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc @@ -1214,7 +1214,7 @@ bool PosixEndpointImpl::Write( // Write succeeded immediately. Return true and don't run the on_writable // callback. GRPC_TRACE_LOG(event_engine_endpoint, INFO) - << "Endpoint[" << this << "]: Write succeded immediately"; + << "Endpoint[" << this << "]: Write succeeded immediately"; return true; } 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 f2275975b0..38e0887e5e 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.cc +++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc @@ -238,14 +238,16 @@ void AsyncConnect::OnWritable(absl::Status status) } } -EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal( - PosixSocketWrapper sock, OnConnectCallback on_connect, ResolvedAddress addr, - MemoryAllocator&& allocator, const PosixTcpOptions& options, - Duration timeout) { +EventEngine::ConnectionHandle +PosixEventEngine::CreateEndpointFromUnconnectedFdInternal( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, + const PosixTcpOptions& tcp_options, MemoryAllocator memory_allocator, + EventEngine::Duration timeout) { int err; int connect_errno; do { - err = connect(sock.Fd(), addr.address(), addr.size()); + err = connect(fd, addr.address(), addr.size()); } while (err < 0 && errno == EINTR); connect_errno = (err < 0) ? errno : 0; @@ -261,16 +263,15 @@ EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal( std::string name = absl::StrCat("tcp-client:", addr_uri.value()); PosixEventPoller* poller = poller_manager_->Poller(); EventHandle* handle = - poller->CreateHandle(sock.Fd(), name, poller->CanTrackErrors()); + poller->CreateHandle(fd, name, poller->CanTrackErrors()); if (connect_errno == 0) { - // Connection already succeded. Return 0 to discourage any cancellation + // Connection already succeeded. Return 0 to discourage any cancellation // attempts. Run([on_connect = std::move(on_connect), - ep = CreatePosixEndpoint(handle, nullptr, shared_from_this(), - std::move(allocator), options)]() mutable { - on_connect(std::move(ep)); - }); + ep = CreatePosixEndpoint( + handle, nullptr, shared_from_this(), std::move(memory_allocator), + tcp_options)]() mutable { on_connect(std::move(ep)); }); return EventEngine::ConnectionHandle::kInvalid; } if (connect_errno != EWOULDBLOCK && connect_errno != EINPROGRESS) { @@ -288,9 +289,10 @@ EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal( // Connection is still in progress. int64_t connection_id = last_connection_id_.fetch_add(1, std::memory_order_acq_rel); - AsyncConnect* ac = new AsyncConnect( - std::move(on_connect), shared_from_this(), executor_.get(), handle, - std::move(allocator), options, addr_uri.value(), connection_id); + AsyncConnect* ac = + new AsyncConnect(std::move(on_connect), shared_from_this(), + executor_.get(), handle, std::move(memory_allocator), + tcp_options, addr_uri.value(), connection_id); int shard_number = connection_id % connection_shards_.size(); struct ConnectionShard* shard = &connection_shards_[shard_number]; { @@ -605,7 +607,7 @@ bool PosixEventEngine::CancelConnect(EventEngine::ConnectionHandle handle) { // Shutdown the fd. This would cause OnWritable to run as soon as // possible. We dont need to pass a custom error here because it wont be // used since the on_connect_closure is not run if connect cancellation is - // successfull. + // successful. ac->fd_->ShutdownHandle( absl::FailedPreconditionError("Connection cancelled")); } @@ -635,14 +637,29 @@ EventEngine::ConnectionHandle PosixEventEngine::Connect( status = socket.status()]() mutable { on_connect(status); }); return EventEngine::ConnectionHandle::kInvalid; } - return ConnectInternal((*socket).sock, std::move(on_connect), - (*socket).mapped_target_addr, - std::move(memory_allocator), options, timeout); + return CreateEndpointFromUnconnectedFdInternal( + (*socket).sock.Fd(), std::move(on_connect), (*socket).mapped_target_addr, + options, std::move(memory_allocator), timeout); #else // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING grpc_core::Crash("EventEngine::Connect is not supported on this platform"); #endif // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING } +EventEngine::ConnectionHandle PosixEventEngine::CreateEndpointFromUnconnectedFd( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, const EndpointConfig& config, + MemoryAllocator memory_allocator, EventEngine::Duration timeout) { +#if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING + return CreateEndpointFromUnconnectedFdInternal( + fd, std::move(on_connect), addr, TcpOptionsFromEndpointConfig(config), + std::move(memory_allocator), timeout); +#else // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING + grpc_core::Crash( + "EventEngine::CreateEndpointFromUnconnectedFd is not supported on this " + "platform"); +#endif // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING +} + std::unique_ptr PosixEventEngine::CreatePosixEndpointFromFd(int fd, const EndpointConfig& config, diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h index 82be0bdd0e..63a142a11f 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine.h @@ -174,6 +174,11 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport, std::unique_ptr CreateEndpointFromFd( int fd, const EndpointConfig& config) override; + ConnectionHandle CreateEndpointFromUnconnectedFd( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, const EndpointConfig& config, + MemoryAllocator memory_allocator, EventEngine::Duration timeout) override; + absl::StatusOr> CreateListener( Listener::AcceptCallback on_accept, absl::AnyInvocable on_shutdown, @@ -235,12 +240,10 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport, static void PollerWorkInternal( std::shared_ptr poller_manager); - ConnectionHandle ConnectInternal( - grpc_event_engine::experimental::PosixSocketWrapper sock, - OnConnectCallback on_connect, ResolvedAddress addr, - MemoryAllocator&& allocator, - const grpc_event_engine::experimental::PosixTcpOptions& options, - Duration timeout); + ConnectionHandle CreateEndpointFromUnconnectedFdInternal( + int fd, EventEngine::OnConnectCallback on_connect, + const EventEngine::ResolvedAddress& addr, const PosixTcpOptions& options, + MemoryAllocator memory_allocator, EventEngine::Duration timeout); void OnConnectFinishInternal(int connection_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 ce95139e6e..05d43336b8 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 @@ -291,7 +291,7 @@ absl::Status PosixEngineListenerImpl::HandleExternalConnection( } void PosixEngineListenerImpl::AsyncConnectionAcceptor::Shutdown() { - // The ShutdownHandle whould trigger any waiting notify_on_accept_ to get + // The ShutdownHandle would trigger any waiting notify_on_accept_ to get // scheduled with the not-OK status. handle_->ShutdownHandle(absl::InternalError("Shutting down acceptor")); Unref(); diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h index 1ddbe1b3fb..3bc306c791 100644 --- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h +++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h @@ -107,8 +107,11 @@ class PosixEngineListenerImpl } ListenerSocketsContainer::ListenerSocket& Socket() { return socket_; } ~AsyncConnectionAcceptor() { - // If uds socket, unlink it so that the corresponding file is deleted. - UnlinkIfUnixDomainSocket(*socket_.sock.LocalAddress()); + auto address = socket_.sock.LocalAddress(); + if (address.ok()) { + // If uds socket, unlink it so that the corresponding file is deleted. + UnlinkIfUnixDomainSocket(*address); + } handle_->OrphanHandle(nullptr, nullptr, ""); delete notify_on_accept_; } diff --git a/src/core/lib/event_engine/posix_engine/timer_heap.cc b/src/core/lib/event_engine/posix_engine/timer_heap.cc index 85fbdb9e01..458d0b058e 100644 --- a/src/core/lib/event_engine/posix_engine/timer_heap.cc +++ b/src/core/lib/event_engine/posix_engine/timer_heap.cc @@ -50,7 +50,7 @@ void TimerHeap::AdjustUpwards(size_t i, Timer* t) { // position. void TimerHeap::AdjustDownwards(size_t i, Timer* t) { for (;;) { - size_t left_child = 1 + 2 * i; + size_t left_child = 1 + (2 * i); if (left_child >= timers_.size()) break; size_t right_child = left_child + 1; size_t next_i = diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc index 2bc411b9d6..34517da4f7 100644 --- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc +++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc @@ -45,7 +45,7 @@ void FillGprFromTimestamp(gpr_timespec* gts, const struct timespec* ts) { } void DefaultTimestampsCallback(void* /*arg*/, Timestamps* /*ts*/, - absl::Status /*shudown_err*/) { + absl::Status /*shutdown_err*/) { VLOG(2) << "Timestamps callback has not been registered"; } diff --git a/src/core/lib/event_engine/resolved_address.cc b/src/core/lib/event_engine/resolved_address.cc index 1a41663bed..2672923f8c 100644 --- a/src/core/lib/event_engine/resolved_address.cc +++ b/src/core/lib/event_engine/resolved_address.cc @@ -48,6 +48,9 @@ EventEngine::ResolvedAddress CreateResolvedAddress( grpc_resolved_address CreateGRPCResolvedAddress( const EventEngine::ResolvedAddress& ra) { + static_assert( + GRPC_MAX_SOCKADDR_SIZE == EventEngine::ResolvedAddress::MAX_SIZE_BYTES, + "size should match"); grpc_resolved_address grpc_addr; memset(&grpc_addr, 0, sizeof(grpc_resolved_address)); memcpy(grpc_addr.addr, ra.address(), ra.size()); diff --git a/src/core/lib/event_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/tcp_socket_utils.cc index d4ef7a8bb4..8ea244a8ff 100644 --- a/src/core/lib/event_engine/tcp_socket_utils.cc +++ b/src/core/lib/event_engine/tcp_socket_utils.cc @@ -141,12 +141,6 @@ absl::StatusOr ResolvedAddrToUriUnixIfPossible( return uri->ToString(); } #else - -absl::StatusOr ResolvedAddrToUnixPathIfPossible( - const EventEngine::ResolvedAddress* /*resolved_addr*/) { - return absl::InvalidArgumentError("Unix socket is not supported."); -} - absl::StatusOr ResolvedAddrToUriUnixIfPossible( const EventEngine::ResolvedAddress* /*resolved_addr*/) { return absl::InvalidArgumentError("Unix socket is not supported."); 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 a8f35bb1cf..808a6e5c7b 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 @@ -116,7 +116,7 @@ namespace { constexpr auto kIdleThreadLimit = std::chrono::seconds(20); // Rate at which "Waiting for ..." logs should be printed while quiescing. constexpr size_t kBlockingQuiesceLogRateSeconds = 3; -// Minumum time between thread creations. +// Minimum time between thread creations. constexpr grpc_core::Duration kTimeBetweenThrottledThreadStarts = grpc_core::Duration::Seconds(1); // Minimum time a worker thread should sleep between checking for new work. Used diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc index f2a202315c..ad4b44a287 100644 --- a/src/core/lib/event_engine/utils.cc +++ b/src/core/lib/event_engine/utils.cc @@ -20,6 +20,7 @@ #include #include "absl/strings/str_cat.h" +#include "src/core/util/notification.h" #include "src/core/util/time.h" namespace grpc_event_engine { @@ -38,5 +39,20 @@ grpc_core::Timestamp ToTimestamp(grpc_core::Timestamp now, grpc_core::Duration::Milliseconds(1); } +absl::StatusOr> +LookupHostnameBlocking(EventEngine::DNSResolver* dns_resolver, + absl::string_view name, absl::string_view default_port) { + absl::StatusOr> results; + grpc_core::Notification done; + dns_resolver->LookupHostname( + [&](absl::StatusOr> addresses) { + results = std::move(addresses); + done.Notify(); + }, + name, default_port); + done.WaitForNotification(); + return results; +} + } // namespace experimental } // namespace grpc_event_engine diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h index 45675ee8d8..0e15d69b49 100644 --- a/src/core/lib/event_engine/utils.h +++ b/src/core/lib/event_engine/utils.h @@ -19,7 +19,10 @@ #include #include +#include +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" #include "src/core/util/time.h" namespace grpc_event_engine { @@ -36,6 +39,10 @@ std::string HandleToString(const Handle& handle) { grpc_core::Timestamp ToTimestamp(grpc_core::Timestamp now, EventEngine::Duration delta); +absl::StatusOr> +LookupHostnameBlocking(EventEngine::DNSResolver* dns_resolver, + absl::string_view name, absl::string_view default_port); + } // namespace experimental } // namespace grpc_event_engine diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc index 3bfd15537e..0d4dcd5579 100644 --- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc @@ -224,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd { // c-ares overloads this recv_from virtual socket function to receive // data on both UDP and TCP sockets, and from is nullptr for TCP. if (from != nullptr) { - CHECK(*from_len <= recv_from_source_addr_len_); + CHECK(*from_len >= recv_from_source_addr_len_); memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_); *from_len = recv_from_source_addr_len_; } diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc index 3b16c060de..5eb3191198 100644 --- a/src/core/lib/event_engine/windows/windows_endpoint.cc +++ b/src/core/lib/event_engine/windows/windows_endpoint.cc @@ -42,7 +42,8 @@ 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(); GRPC_TRACE_LOG(event_engine_endpoint, INFO) - << context_string << ": " << str; + << context_string << " [" << i + 1 << "/" << buffer->Count() + << "]: " << str; } } @@ -78,7 +79,7 @@ WindowsEndpoint::~WindowsEndpoint() { void WindowsEndpoint::AsyncIOState::DoTcpRead(SliceBuffer* buffer) { GRPC_TRACE_LOG(event_engine_endpoint, INFO) - << "WindowsEndpoint::" << endpoint << " reading"; + << "WindowsEndpoint::" << endpoint << " attempting a read"; if (socket->IsShutdown()) { socket->read_info()->SetErrorStatus( absl::InternalError("Socket is shutting down.")); @@ -120,7 +121,7 @@ void WindowsEndpoint::AsyncIOState::DoTcpRead(SliceBuffer* buffer) { // The async read attempt returned an error immediately. socket->UnregisterReadCallback(); socket->read_info()->SetResult( - wsa_error, 0, absl::StrFormat("WindowsEndpont::%p Read failed", this)); + wsa_error, 0, absl::StrFormat("WindowsEndpoint::%p Read failed", this)); thread_pool->Run(&handle_read_event); } } @@ -294,15 +295,23 @@ void WindowsEndpoint::HandleReadClosure::Run() { return ResetAndReturnCallback()(status); } if (result.bytes_transferred == 0) { + DCHECK_GT(io_state.use_count(), 0); // Either the endpoint is shut down or we've seen the end of the stream if (GRPC_TRACE_FLAG_ENABLED(event_engine_endpoint_data)) { - DumpSliceBuffer(buffer_, absl::StrFormat("WindowsEndpoint::%p READ", - io_state->endpoint)); + LOG(INFO) << "WindowsEndpoint::" << this << " read 0 bytes."; + DumpSliceBuffer( + &last_read_buffer_, + absl::StrFormat("WindowsEndpoint::%p READ last_read_buffer_: ", + io_state->endpoint)); } - status = absl::InternalError("End of TCP stream"); - grpc_core::StatusSetInt(&status, grpc_core::StatusIntProperty::kRpcStatus, - GRPC_STATUS_UNAVAILABLE); buffer_->Swap(last_read_buffer_); + if (buffer_->Length() == 0) { + // Only send an error if there is no more data to consume. If the endpoint + // or socket is shut down, the next read will discover that. + status = absl::InternalError("End of TCP stream"); + grpc_core::StatusSetInt(&status, grpc_core::StatusIntProperty::kRpcStatus, + GRPC_STATUS_UNAVAILABLE); + } return ResetAndReturnCallback()(status); } DCHECK_GT(result.bytes_transferred, 0); @@ -320,8 +329,13 @@ void WindowsEndpoint::HandleReadClosure::Run() { bool WindowsEndpoint::HandleReadClosure::MaybeFinishIfDataHasAlreadyBeenRead() { if (last_read_buffer_.Length() > 0) { + GRPC_TRACE_LOG(event_engine_endpoint, INFO) + << "WindowsEndpoint::" << io_state_->endpoint + << " finishing a synchronous read"; buffer_->Swap(last_read_buffer_); - // Captures io_state_ to ensure it remains alive until the callback is run. + if (GRPC_TRACE_FLAG_ENABLED(event_engine_endpoint_data)) { + DumpSliceBuffer(buffer_, "finishing synchronous read"); + } io_state_->thread_pool->Run( [cb = ResetAndReturnCallback()]() mutable { cb(absl::OkStatus()); }); return true; diff --git a/src/core/lib/event_engine/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h index c9a597b571..be9cf7a274 100644 --- a/src/core/lib/event_engine/windows/windows_engine.h +++ b/src/core/lib/event_engine/windows/windows_engine.h @@ -125,7 +125,7 @@ class WindowsEventEngine : public EventEngine, // runs once. OnConnectCallback TakeCallback() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - // Create an Endpoint, transfering held object ownership to the endpoint. + // Create an Endpoint, transferring held object ownership to the endpoint. // // This can only be called once, and the connection state is no longer valid // after an endpoint has been created. Callers must guarantee that the diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc index f2ec5d1a0d..0488c5a5da 100644 --- a/src/core/lib/experiments/config.cc +++ b/src/core/lib/experiments/config.cc @@ -31,7 +31,7 @@ #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/util/crash.h" // IWYU pragma: keep #include "src/core/util/no_destruct.h" diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index 8464f0756a..703a8a171e 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -17,30 +17,54 @@ #include "src/core/lib/experiments/experiments.h" #include +#include #ifndef GRPC_EXPERIMENTS_ARE_FINAL #if defined(GRPC_CFSTREAM) namespace { +const char* const description_backoff_cap_initial_at_max = + "Backoff library applies max_backoff even on initial_backoff."; +const char* const additional_constraints_backoff_cap_initial_at_max = "{}"; 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 = "{}"; +const char* const description_chaotic_good_legacy_protocol = + "If set, use the first version of the chaotic-good protocol when that " + "protocol is enabled."; +const char* const additional_constraints_chaotic_good_legacy_protocol = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; +const char* const description_disable_buffer_hint_on_high_memory_pressure = + "Disable buffer hint flag parsing in the transport under high memory " + "pressure."; +const char* const + additional_constraints_disable_buffer_hint_on_high_memory_pressure = "{}"; const char* const description_event_engine_application_callbacks = "Run application callbacks in EventEngine threads, instead of on the " "thread-local ApplicationCallbackExecCtx"; const char* const additional_constraints_event_engine_application_callbacks = "{}"; +const char* const description_event_engine_callback_cq = + "Use EventEngine instead of the CallbackAlternativeCQ."; +const char* const additional_constraints_event_engine_callback_cq = "{}"; +const uint8_t required_experiments_event_engine_callback_cq[] = { + static_cast( + grpc_core::kExperimentIdEventEngineApplicationCallbacks)}; const char* const description_event_engine_client = "Use EventEngine clients instead of iomgr's grpc_tcp_client"; const char* const additional_constraints_event_engine_client = "{}"; const char* const description_event_engine_dns = "If set, use EventEngine DNSResolver for client channel resolution"; const char* const additional_constraints_event_engine_dns = "{}"; +const char* const description_event_engine_dns_non_client_channel = + "If set, use EventEngine DNSResolver in other places besides client " + "channel."; +const char* const additional_constraints_event_engine_dns_non_client_channel = + "{}"; const char* const description_event_engine_listener = "Use EventEngine listeners instead of iomgr's grpc_tcp_server"; const char* const additional_constraints_event_engine_listener = "{}"; @@ -65,9 +89,31 @@ const char* const additional_constraints_multiping = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; +const char* const description_prioritize_finished_requests = + "Prioritize flushing out finished requests over other in-flight requests " + "during transport writes."; +const char* const additional_constraints_prioritize_finished_requests = "{}"; +const char* const description_promise_based_http2_client_transport = + "Use promises for the http2 client transport. We have kept client and " + "server transport experiments separate to help with smoother roll outs and " + "also help with interop testing."; +const char* const additional_constraints_promise_based_http2_client_transport = + "{}"; +const char* const description_promise_based_http2_server_transport = + "Use promises for the http2 server transport. We have kept client and " + "server transport experiments separate to help with smoother roll outs and " + "also help with interop testing."; +const char* const additional_constraints_promise_based_http2_server_transport = + "{}"; const char* const description_promise_based_inproc_transport = "Use promises for the in-process transport."; const char* const additional_constraints_promise_based_inproc_transport = "{}"; +const char* const description_retry_in_callv3 = "Support retries with call-v3"; +const char* const additional_constraints_retry_in_callv3 = "{}"; +const char* const description_rq_fast_reject = + "Resource quota rejects requests immediately (before allocating the " + "request structure) under very high memory pressure."; +const char* const additional_constraints_rq_fast_reject = "{}"; const char* const description_schedule_cancellation_over_write = "Allow cancellation op to be scheduled over a write"; const char* const additional_constraints_schedule_cancellation_over_write = @@ -94,10 +140,6 @@ const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = "{}"; -const char* const description_work_serializer_clears_time_cache = - "Have the work serializer clear the time cache when it dispatches work."; -const char* const additional_constraints_work_serializer_clears_time_cache = - "{}"; const char* const description_work_serializer_dispatch = "Have the work serializer dispatch work to event engine for every " "callback, instead of running things inline in the first thread that " @@ -108,20 +150,36 @@ const char* const additional_constraints_work_serializer_dispatch = "{}"; namespace grpc_core { const ExperimentMetadata g_experiment_metadata[] = { + {"backoff_cap_initial_at_max", description_backoff_cap_initial_at_max, + additional_constraints_backoff_cap_initial_at_max, 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}, + {"chaotic_good_legacy_protocol", description_chaotic_good_legacy_protocol, + additional_constraints_chaotic_good_legacy_protocol, nullptr, 0, false, + true}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, nullptr, 0, false, false}, + {"disable_buffer_hint_on_high_memory_pressure", + description_disable_buffer_hint_on_high_memory_pressure, + additional_constraints_disable_buffer_hint_on_high_memory_pressure, + nullptr, 0, false, true}, {"event_engine_application_callbacks", description_event_engine_application_callbacks, additional_constraints_event_engine_application_callbacks, nullptr, 0, true, true}, + {"event_engine_callback_cq", description_event_engine_callback_cq, + additional_constraints_event_engine_callback_cq, + required_experiments_event_engine_callback_cq, 1, true, true}, {"event_engine_client", description_event_engine_client, additional_constraints_event_engine_client, nullptr, 0, false, true}, {"event_engine_dns", description_event_engine_dns, additional_constraints_event_engine_dns, nullptr, 0, false, false}, + {"event_engine_dns_non_client_channel", + description_event_engine_dns_non_client_channel, + additional_constraints_event_engine_dns_non_client_channel, nullptr, 0, + false, false}, {"event_engine_listener", description_event_engine_listener, additional_constraints_event_engine_listener, nullptr, 0, false, true}, {"free_large_allocator", description_free_large_allocator, @@ -137,10 +195,25 @@ const ExperimentMetadata g_experiment_metadata[] = { nullptr, 0, false, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, + {"prioritize_finished_requests", description_prioritize_finished_requests, + additional_constraints_prioritize_finished_requests, nullptr, 0, false, + true}, + {"promise_based_http2_client_transport", + description_promise_based_http2_client_transport, + additional_constraints_promise_based_http2_client_transport, nullptr, 0, + false, true}, + {"promise_based_http2_server_transport", + description_promise_based_http2_server_transport, + additional_constraints_promise_based_http2_server_transport, nullptr, 0, + false, true}, {"promise_based_inproc_transport", description_promise_based_inproc_transport, additional_constraints_promise_based_inproc_transport, nullptr, 0, false, false}, + {"retry_in_callv3", description_retry_in_callv3, + additional_constraints_retry_in_callv3, nullptr, 0, false, true}, + {"rq_fast_reject", description_rq_fast_reject, + additional_constraints_rq_fast_reject, nullptr, 0, false, true}, {"schedule_cancellation_over_write", description_schedule_cancellation_over_write, additional_constraints_schedule_cancellation_over_write, nullptr, 0, false, @@ -159,37 +232,56 @@ const ExperimentMetadata g_experiment_metadata[] = { description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, false, true}, - {"work_serializer_clears_time_cache", - description_work_serializer_clears_time_cache, - 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, false, true}, + additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, }; } // namespace grpc_core #elif defined(GPR_WINDOWS) namespace { +const char* const description_backoff_cap_initial_at_max = + "Backoff library applies max_backoff even on initial_backoff."; +const char* const additional_constraints_backoff_cap_initial_at_max = "{}"; 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 = "{}"; +const char* const description_chaotic_good_legacy_protocol = + "If set, use the first version of the chaotic-good protocol when that " + "protocol is enabled."; +const char* const additional_constraints_chaotic_good_legacy_protocol = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; +const char* const description_disable_buffer_hint_on_high_memory_pressure = + "Disable buffer hint flag parsing in the transport under high memory " + "pressure."; +const char* const + additional_constraints_disable_buffer_hint_on_high_memory_pressure = "{}"; const char* const description_event_engine_application_callbacks = "Run application callbacks in EventEngine threads, instead of on the " "thread-local ApplicationCallbackExecCtx"; const char* const additional_constraints_event_engine_application_callbacks = "{}"; +const char* const description_event_engine_callback_cq = + "Use EventEngine instead of the CallbackAlternativeCQ."; +const char* const additional_constraints_event_engine_callback_cq = "{}"; +const uint8_t required_experiments_event_engine_callback_cq[] = { + static_cast( + grpc_core::kExperimentIdEventEngineApplicationCallbacks)}; const char* const description_event_engine_client = "Use EventEngine clients instead of iomgr's grpc_tcp_client"; const char* const additional_constraints_event_engine_client = "{}"; const char* const description_event_engine_dns = "If set, use EventEngine DNSResolver for client channel resolution"; const char* const additional_constraints_event_engine_dns = "{}"; +const char* const description_event_engine_dns_non_client_channel = + "If set, use EventEngine DNSResolver in other places besides client " + "channel."; +const char* const additional_constraints_event_engine_dns_non_client_channel = + "{}"; const char* const description_event_engine_listener = "Use EventEngine listeners instead of iomgr's grpc_tcp_server"; const char* const additional_constraints_event_engine_listener = "{}"; @@ -214,9 +306,31 @@ const char* const additional_constraints_multiping = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; +const char* const description_prioritize_finished_requests = + "Prioritize flushing out finished requests over other in-flight requests " + "during transport writes."; +const char* const additional_constraints_prioritize_finished_requests = "{}"; +const char* const description_promise_based_http2_client_transport = + "Use promises for the http2 client transport. We have kept client and " + "server transport experiments separate to help with smoother roll outs and " + "also help with interop testing."; +const char* const additional_constraints_promise_based_http2_client_transport = + "{}"; +const char* const description_promise_based_http2_server_transport = + "Use promises for the http2 server transport. We have kept client and " + "server transport experiments separate to help with smoother roll outs and " + "also help with interop testing."; +const char* const additional_constraints_promise_based_http2_server_transport = + "{}"; const char* const description_promise_based_inproc_transport = "Use promises for the in-process transport."; const char* const additional_constraints_promise_based_inproc_transport = "{}"; +const char* const description_retry_in_callv3 = "Support retries with call-v3"; +const char* const additional_constraints_retry_in_callv3 = "{}"; +const char* const description_rq_fast_reject = + "Resource quota rejects requests immediately (before allocating the " + "request structure) under very high memory pressure."; +const char* const additional_constraints_rq_fast_reject = "{}"; const char* const description_schedule_cancellation_over_write = "Allow cancellation op to be scheduled over a write"; const char* const additional_constraints_schedule_cancellation_over_write = @@ -243,10 +357,6 @@ const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = "{}"; -const char* const description_work_serializer_clears_time_cache = - "Have the work serializer clear the time cache when it dispatches work."; -const char* const additional_constraints_work_serializer_clears_time_cache = - "{}"; const char* const description_work_serializer_dispatch = "Have the work serializer dispatch work to event engine for every " "callback, instead of running things inline in the first thread that " @@ -257,20 +367,36 @@ const char* const additional_constraints_work_serializer_dispatch = "{}"; namespace grpc_core { const ExperimentMetadata g_experiment_metadata[] = { + {"backoff_cap_initial_at_max", description_backoff_cap_initial_at_max, + additional_constraints_backoff_cap_initial_at_max, 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}, + {"chaotic_good_legacy_protocol", description_chaotic_good_legacy_protocol, + additional_constraints_chaotic_good_legacy_protocol, nullptr, 0, false, + true}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, nullptr, 0, false, false}, + {"disable_buffer_hint_on_high_memory_pressure", + description_disable_buffer_hint_on_high_memory_pressure, + additional_constraints_disable_buffer_hint_on_high_memory_pressure, + nullptr, 0, false, true}, {"event_engine_application_callbacks", description_event_engine_application_callbacks, additional_constraints_event_engine_application_callbacks, nullptr, 0, true, true}, + {"event_engine_callback_cq", description_event_engine_callback_cq, + additional_constraints_event_engine_callback_cq, + required_experiments_event_engine_callback_cq, 1, true, true}, {"event_engine_client", description_event_engine_client, additional_constraints_event_engine_client, nullptr, 0, true, true}, {"event_engine_dns", description_event_engine_dns, additional_constraints_event_engine_dns, nullptr, 0, true, false}, + {"event_engine_dns_non_client_channel", + description_event_engine_dns_non_client_channel, + additional_constraints_event_engine_dns_non_client_channel, nullptr, 0, + false, false}, {"event_engine_listener", description_event_engine_listener, additional_constraints_event_engine_listener, nullptr, 0, true, true}, {"free_large_allocator", description_free_large_allocator, @@ -286,10 +412,25 @@ const ExperimentMetadata g_experiment_metadata[] = { nullptr, 0, false, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, + {"prioritize_finished_requests", description_prioritize_finished_requests, + additional_constraints_prioritize_finished_requests, nullptr, 0, false, + true}, + {"promise_based_http2_client_transport", + description_promise_based_http2_client_transport, + additional_constraints_promise_based_http2_client_transport, nullptr, 0, + false, true}, + {"promise_based_http2_server_transport", + description_promise_based_http2_server_transport, + additional_constraints_promise_based_http2_server_transport, nullptr, 0, + false, true}, {"promise_based_inproc_transport", description_promise_based_inproc_transport, additional_constraints_promise_based_inproc_transport, nullptr, 0, false, false}, + {"retry_in_callv3", description_retry_in_callv3, + additional_constraints_retry_in_callv3, nullptr, 0, false, true}, + {"rq_fast_reject", description_rq_fast_reject, + additional_constraints_rq_fast_reject, nullptr, 0, false, true}, {"schedule_cancellation_over_write", description_schedule_cancellation_over_write, additional_constraints_schedule_cancellation_over_write, nullptr, 0, false, @@ -308,37 +449,56 @@ const ExperimentMetadata g_experiment_metadata[] = { description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, false, true}, - {"work_serializer_clears_time_cache", - description_work_serializer_clears_time_cache, - 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, false, true}, + additional_constraints_work_serializer_dispatch, nullptr, 0, true, true}, }; } // namespace grpc_core #else namespace { +const char* const description_backoff_cap_initial_at_max = + "Backoff library applies max_backoff even on initial_backoff."; +const char* const additional_constraints_backoff_cap_initial_at_max = "{}"; 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 = "{}"; +const char* const description_chaotic_good_legacy_protocol = + "If set, use the first version of the chaotic-good protocol when that " + "protocol is enabled."; +const char* const additional_constraints_chaotic_good_legacy_protocol = "{}"; const char* const description_client_privacy = "If set, client privacy"; const char* const additional_constraints_client_privacy = "{}"; +const char* const description_disable_buffer_hint_on_high_memory_pressure = + "Disable buffer hint flag parsing in the transport under high memory " + "pressure."; +const char* const + additional_constraints_disable_buffer_hint_on_high_memory_pressure = "{}"; const char* const description_event_engine_application_callbacks = "Run application callbacks in EventEngine threads, instead of on the " "thread-local ApplicationCallbackExecCtx"; const char* const additional_constraints_event_engine_application_callbacks = "{}"; +const char* const description_event_engine_callback_cq = + "Use EventEngine instead of the CallbackAlternativeCQ."; +const char* const additional_constraints_event_engine_callback_cq = "{}"; +const uint8_t required_experiments_event_engine_callback_cq[] = { + static_cast( + grpc_core::kExperimentIdEventEngineApplicationCallbacks)}; const char* const description_event_engine_client = "Use EventEngine clients instead of iomgr's grpc_tcp_client"; const char* const additional_constraints_event_engine_client = "{}"; const char* const description_event_engine_dns = "If set, use EventEngine DNSResolver for client channel resolution"; const char* const additional_constraints_event_engine_dns = "{}"; +const char* const description_event_engine_dns_non_client_channel = + "If set, use EventEngine DNSResolver in other places besides client " + "channel."; +const char* const additional_constraints_event_engine_dns_non_client_channel = + "{}"; const char* const description_event_engine_listener = "Use EventEngine listeners instead of iomgr's grpc_tcp_server"; const char* const additional_constraints_event_engine_listener = "{}"; @@ -363,9 +523,31 @@ const char* const additional_constraints_multiping = "{}"; const char* const description_pick_first_new = "New pick_first impl with memory reduction."; const char* const additional_constraints_pick_first_new = "{}"; +const char* const description_prioritize_finished_requests = + "Prioritize flushing out finished requests over other in-flight requests " + "during transport writes."; +const char* const additional_constraints_prioritize_finished_requests = "{}"; +const char* const description_promise_based_http2_client_transport = + "Use promises for the http2 client transport. We have kept client and " + "server transport experiments separate to help with smoother roll outs and " + "also help with interop testing."; +const char* const additional_constraints_promise_based_http2_client_transport = + "{}"; +const char* const description_promise_based_http2_server_transport = + "Use promises for the http2 server transport. We have kept client and " + "server transport experiments separate to help with smoother roll outs and " + "also help with interop testing."; +const char* const additional_constraints_promise_based_http2_server_transport = + "{}"; const char* const description_promise_based_inproc_transport = "Use promises for the in-process transport."; const char* const additional_constraints_promise_based_inproc_transport = "{}"; +const char* const description_retry_in_callv3 = "Support retries with call-v3"; +const char* const additional_constraints_retry_in_callv3 = "{}"; +const char* const description_rq_fast_reject = + "Resource quota rejects requests immediately (before allocating the " + "request structure) under very high memory pressure."; +const char* const additional_constraints_rq_fast_reject = "{}"; const char* const description_schedule_cancellation_over_write = "Allow cancellation op to be scheduled over a write"; const char* const additional_constraints_schedule_cancellation_over_write = @@ -392,10 +574,6 @@ const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = "{}"; -const char* const description_work_serializer_clears_time_cache = - "Have the work serializer clear the time cache when it dispatches work."; -const char* const additional_constraints_work_serializer_clears_time_cache = - "{}"; const char* const description_work_serializer_dispatch = "Have the work serializer dispatch work to event engine for every " "callback, instead of running things inline in the first thread that " @@ -406,20 +584,36 @@ const char* const additional_constraints_work_serializer_dispatch = "{}"; namespace grpc_core { const ExperimentMetadata g_experiment_metadata[] = { + {"backoff_cap_initial_at_max", description_backoff_cap_initial_at_max, + additional_constraints_backoff_cap_initial_at_max, 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}, + {"chaotic_good_legacy_protocol", description_chaotic_good_legacy_protocol, + additional_constraints_chaotic_good_legacy_protocol, nullptr, 0, false, + true}, {"client_privacy", description_client_privacy, additional_constraints_client_privacy, nullptr, 0, false, false}, + {"disable_buffer_hint_on_high_memory_pressure", + description_disable_buffer_hint_on_high_memory_pressure, + additional_constraints_disable_buffer_hint_on_high_memory_pressure, + nullptr, 0, false, true}, {"event_engine_application_callbacks", description_event_engine_application_callbacks, additional_constraints_event_engine_application_callbacks, nullptr, 0, true, true}, + {"event_engine_callback_cq", description_event_engine_callback_cq, + additional_constraints_event_engine_callback_cq, + required_experiments_event_engine_callback_cq, 1, true, true}, {"event_engine_client", description_event_engine_client, - additional_constraints_event_engine_client, nullptr, 0, false, true}, + additional_constraints_event_engine_client, nullptr, 0, true, true}, {"event_engine_dns", description_event_engine_dns, additional_constraints_event_engine_dns, nullptr, 0, true, false}, + {"event_engine_dns_non_client_channel", + description_event_engine_dns_non_client_channel, + additional_constraints_event_engine_dns_non_client_channel, nullptr, 0, + false, false}, {"event_engine_listener", description_event_engine_listener, additional_constraints_event_engine_listener, nullptr, 0, true, true}, {"free_large_allocator", description_free_large_allocator, @@ -435,10 +629,25 @@ const ExperimentMetadata g_experiment_metadata[] = { nullptr, 0, false, true}, {"pick_first_new", description_pick_first_new, additional_constraints_pick_first_new, nullptr, 0, true, true}, + {"prioritize_finished_requests", description_prioritize_finished_requests, + additional_constraints_prioritize_finished_requests, nullptr, 0, false, + true}, + {"promise_based_http2_client_transport", + description_promise_based_http2_client_transport, + additional_constraints_promise_based_http2_client_transport, nullptr, 0, + false, true}, + {"promise_based_http2_server_transport", + description_promise_based_http2_server_transport, + additional_constraints_promise_based_http2_server_transport, nullptr, 0, + false, true}, {"promise_based_inproc_transport", description_promise_based_inproc_transport, additional_constraints_promise_based_inproc_transport, nullptr, 0, false, false}, + {"retry_in_callv3", description_retry_in_callv3, + additional_constraints_retry_in_callv3, nullptr, 0, false, true}, + {"rq_fast_reject", description_rq_fast_reject, + additional_constraints_rq_fast_reject, nullptr, 0, false, true}, {"schedule_cancellation_over_write", description_schedule_cancellation_over_write, additional_constraints_schedule_cancellation_over_write, nullptr, 0, false, @@ -457,10 +666,6 @@ const ExperimentMetadata g_experiment_metadata[] = { description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, false, true}, - {"work_serializer_clears_time_cache", - description_work_serializer_clears_time_cache, - 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}, }; diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index 8aa59e12f9..66341e3826 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -57,14 +57,21 @@ namespace grpc_core { #ifdef GRPC_EXPERIMENTS_ARE_FINAL #if defined(GRPC_CFSTREAM) +#define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX +inline bool IsBackoffCapInitialAtMaxEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } +inline bool IsChaoticGoodLegacyProtocolEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } +inline bool IsDisableBufferHintOnHighMemoryPressureEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS inline bool IsEventEngineApplicationCallbacksEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ +inline bool IsEventEngineCallbackCqEnabled() { return true; } inline bool IsEventEngineClientEnabled() { return false; } inline bool IsEventEngineDnsEnabled() { return false; } +inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; } inline bool IsEventEngineListenerEnabled() { return false; } inline bool IsFreeLargeAllocatorEnabled() { return false; } inline bool IsLocalConnectorSecureEnabled() { return false; } @@ -74,7 +81,12 @@ inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } +inline bool IsPrioritizeFinishedRequestsEnabled() { return false; } +inline bool IsPromiseBasedHttp2ClientTransportEnabled() { return false; } +inline bool IsPromiseBasedHttp2ServerTransportEnabled() { return false; } inline bool IsPromiseBasedInprocTransportEnabled() { return false; } +inline bool IsRetryInCallv3Enabled() { return false; } +inline bool IsRqFastRejectEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } inline bool IsTcpFrameSizeTuningEnabled() { return false; } @@ -84,21 +96,27 @@ inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS 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; } -inline bool IsWorkSerializerDispatchEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH +inline bool IsWorkSerializerDispatchEnabled() { return true; } #elif defined(GPR_WINDOWS) +#define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX +inline bool IsBackoffCapInitialAtMaxEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } +inline bool IsChaoticGoodLegacyProtocolEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } +inline bool IsDisableBufferHintOnHighMemoryPressureEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS inline bool IsEventEngineApplicationCallbacksEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ +inline bool IsEventEngineCallbackCqEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT inline bool IsEventEngineClientEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS inline bool IsEventEngineDnsEnabled() { return true; } +inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } @@ -109,7 +127,12 @@ inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } +inline bool IsPrioritizeFinishedRequestsEnabled() { return false; } +inline bool IsPromiseBasedHttp2ClientTransportEnabled() { return false; } +inline bool IsPromiseBasedHttp2ServerTransportEnabled() { return false; } inline bool IsPromiseBasedInprocTransportEnabled() { return false; } +inline bool IsRetryInCallv3Enabled() { return false; } +inline bool IsRqFastRejectEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } inline bool IsTcpFrameSizeTuningEnabled() { return false; } @@ -119,20 +142,27 @@ inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS 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; } -inline bool IsWorkSerializerDispatchEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH +inline bool IsWorkSerializerDispatchEnabled() { return true; } #else +#define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX +inline bool IsBackoffCapInitialAtMaxEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT inline bool IsCallTracerInTransportEnabled() { return true; } inline bool IsCanaryClientPrivacyEnabled() { return false; } +inline bool IsChaoticGoodLegacyProtocolEnabled() { return false; } inline bool IsClientPrivacyEnabled() { return false; } +inline bool IsDisableBufferHintOnHighMemoryPressureEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS inline bool IsEventEngineApplicationCallbacksEnabled() { return true; } -inline bool IsEventEngineClientEnabled() { return false; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ +inline bool IsEventEngineCallbackCqEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT +inline bool IsEventEngineClientEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS inline bool IsEventEngineDnsEnabled() { return true; } +inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return true; } inline bool IsFreeLargeAllocatorEnabled() { return false; } @@ -143,7 +173,12 @@ inline bool IsMonitoringExperimentEnabled() { return true; } inline bool IsMultipingEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_PICK_FIRST_NEW inline bool IsPickFirstNewEnabled() { return true; } +inline bool IsPrioritizeFinishedRequestsEnabled() { return false; } +inline bool IsPromiseBasedHttp2ClientTransportEnabled() { return false; } +inline bool IsPromiseBasedHttp2ServerTransportEnabled() { return false; } inline bool IsPromiseBasedInprocTransportEnabled() { return false; } +inline bool IsRetryInCallv3Enabled() { return false; } +inline bool IsRqFastRejectEnabled() { return false; } inline bool IsScheduleCancellationOverWriteEnabled() { return false; } inline bool IsServerPrivacyEnabled() { return false; } inline bool IsTcpFrameSizeTuningEnabled() { return false; } @@ -153,20 +188,23 @@ inline bool IsTimeCachingInPartyEnabled() { return true; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS 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; } #endif #else enum ExperimentIds { + kExperimentIdBackoffCapInitialAtMax, kExperimentIdCallTracerInTransport, kExperimentIdCanaryClientPrivacy, + kExperimentIdChaoticGoodLegacyProtocol, kExperimentIdClientPrivacy, + kExperimentIdDisableBufferHintOnHighMemoryPressure, kExperimentIdEventEngineApplicationCallbacks, + kExperimentIdEventEngineCallbackCq, kExperimentIdEventEngineClient, kExperimentIdEventEngineDns, + kExperimentIdEventEngineDnsNonClientChannel, kExperimentIdEventEngineListener, kExperimentIdFreeLargeAllocator, kExperimentIdLocalConnectorSecure, @@ -174,7 +212,12 @@ enum ExperimentIds { kExperimentIdMonitoringExperiment, kExperimentIdMultiping, kExperimentIdPickFirstNew, + kExperimentIdPrioritizeFinishedRequests, + kExperimentIdPromiseBasedHttp2ClientTransport, + kExperimentIdPromiseBasedHttp2ServerTransport, kExperimentIdPromiseBasedInprocTransport, + kExperimentIdRetryInCallv3, + kExperimentIdRqFastReject, kExperimentIdScheduleCancellationOverWrite, kExperimentIdServerPrivacy, kExperimentIdTcpFrameSizeTuning, @@ -182,10 +225,13 @@ enum ExperimentIds { kExperimentIdTimeCachingInParty, kExperimentIdTraceRecordCallops, kExperimentIdUnconstrainedMaxQuotaBufferSize, - kExperimentIdWorkSerializerClearsTimeCache, kExperimentIdWorkSerializerDispatch, kNumExperiments }; +#define GRPC_EXPERIMENT_IS_INCLUDED_BACKOFF_CAP_INITIAL_AT_MAX +inline bool IsBackoffCapInitialAtMaxEnabled() { + return IsExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_CALL_TRACER_IN_TRANSPORT inline bool IsCallTracerInTransportEnabled() { return IsExperimentEnabled(); @@ -194,14 +240,27 @@ inline bool IsCallTracerInTransportEnabled() { inline bool IsCanaryClientPrivacyEnabled() { return IsExperimentEnabled(); } +#define GRPC_EXPERIMENT_IS_INCLUDED_CHAOTIC_GOOD_LEGACY_PROTOCOL +inline bool IsChaoticGoodLegacyProtocolEnabled() { + return IsExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_PRIVACY inline bool IsClientPrivacyEnabled() { return IsExperimentEnabled(); } +#define GRPC_EXPERIMENT_IS_INCLUDED_DISABLE_BUFFER_HINT_ON_HIGH_MEMORY_PRESSURE +inline bool IsDisableBufferHintOnHighMemoryPressureEnabled() { + return IsExperimentEnabled< + kExperimentIdDisableBufferHintOnHighMemoryPressure>(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS inline bool IsEventEngineApplicationCallbacksEnabled() { return IsExperimentEnabled(); } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CALLBACK_CQ +inline bool IsEventEngineCallbackCqEnabled() { + return IsExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT inline bool IsEventEngineClientEnabled() { return IsExperimentEnabled(); @@ -210,6 +269,10 @@ inline bool IsEventEngineClientEnabled() { inline bool IsEventEngineDnsEnabled() { return IsExperimentEnabled(); } +#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS_NON_CLIENT_CHANNEL +inline bool IsEventEngineDnsNonClientChannelEnabled() { + return IsExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER inline bool IsEventEngineListenerEnabled() { return IsExperimentEnabled(); @@ -238,10 +301,30 @@ inline bool IsMultipingEnabled() { inline bool IsPickFirstNewEnabled() { return IsExperimentEnabled(); } +#define GRPC_EXPERIMENT_IS_INCLUDED_PRIORITIZE_FINISHED_REQUESTS +inline bool IsPrioritizeFinishedRequestsEnabled() { + return IsExperimentEnabled(); +} +#define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_HTTP2_CLIENT_TRANSPORT +inline bool IsPromiseBasedHttp2ClientTransportEnabled() { + return IsExperimentEnabled(); +} +#define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_HTTP2_SERVER_TRANSPORT +inline bool IsPromiseBasedHttp2ServerTransportEnabled() { + return IsExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_INPROC_TRANSPORT inline bool IsPromiseBasedInprocTransportEnabled() { return IsExperimentEnabled(); } +#define GRPC_EXPERIMENT_IS_INCLUDED_RETRY_IN_CALLV3 +inline bool IsRetryInCallv3Enabled() { + return IsExperimentEnabled(); +} +#define GRPC_EXPERIMENT_IS_INCLUDED_RQ_FAST_REJECT +inline bool IsRqFastRejectEnabled() { + return IsExperimentEnabled(); +} #define GRPC_EXPERIMENT_IS_INCLUDED_SCHEDULE_CANCELLATION_OVER_WRITE inline bool IsScheduleCancellationOverWriteEnabled() { return IsExperimentEnabled(); @@ -270,10 +353,6 @@ inline bool IsTraceRecordCallopsEnabled() { inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return IsExperimentEnabled(); } -#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE -inline bool IsWorkSerializerClearsTimeCacheEnabled() { - return IsExperimentEnabled(); -} #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH inline bool IsWorkSerializerDispatchEnabled() { return IsExperimentEnabled(); diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index 1cc2cbb4e9..73d225a99b 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -41,7 +41,7 @@ void FillGprFromTimestamp(gpr_timespec* gts, const struct timespec* ts) { } void DefaultTimestampsCallback(void* /*arg*/, Timestamps* /*ts*/, - absl::Status /*shudown_err*/) { + absl::Status /*shutdown_err*/) { VLOG(2) << "Timestamps callback has not been registered"; } diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h index 8e4b718979..9bb8c0ed6f 100644 --- a/src/core/lib/iomgr/call_combiner.h +++ b/src/core/lib/iomgr/call_combiner.h @@ -80,7 +80,7 @@ class CallCombiner { /// /// The closure will be scheduled in the following cases: /// - If Cancel() was called prior to registering the closure, it will be - /// scheduled immediately with the cancelation error. + /// scheduled immediately with the cancellation error. /// - If Cancel() is called after registering the closure, the closure will /// be scheduled with the cancellation error. /// - If SetNotifyOnCancel() is called again to register a new cancellation diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h index cf01653e9d..2404767caf 100644 --- a/src/core/lib/iomgr/closure.h +++ b/src/core/lib/iomgr/closure.h @@ -212,7 +212,9 @@ inline grpc_closure* grpc_closure_create(grpc_iomgr_cb_func cb, void* cb_arg) { #endif #define GRPC_CLOSURE_LIST_INIT \ - { nullptr, nullptr } + { \ + nullptr, nullptr \ + } inline void grpc_closure_list_init(grpc_closure_list* closure_list) { closure_list->head = closure_list->tail = nullptr; diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h index f7fd6bd695..f022114c79 100644 --- a/src/core/lib/iomgr/combiner.h +++ b/src/core/lib/iomgr/combiner.h @@ -41,7 +41,7 @@ class Combiner { // either: // a pointer to the initiating exec ctx if that is the only exec_ctx that has // ever queued to this combiner, or NULL. If this is non-null, it's not - // dereferencable (since the initiating exec_ctx may have gone out of scope) + // dereferenceable (since the initiating exec_ctx may have gone out of scope) gpr_atm initiating_exec_ctx_or_null; // state is: // lower bit - zero if orphaned (STATE_UNORPHANED) diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc index e20f05e518..17d400c64a 100644 --- a/src/core/lib/iomgr/ev_apple.cc +++ b/src/core/lib/iomgr/ev_apple.cc @@ -57,7 +57,7 @@ struct GlobalRunLoopContext { }; struct GrpcAppleWorker { - // The condition varible to kick the worker. Works with the pollset's lock + // The condition variable to kick the worker. Works with the pollset's lock // (GrpcApplePollset.mu). grpc_core::CondVar cv; diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index a290c3d1bd..bc7c3b4b55 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -706,7 +706,7 @@ static grpc_error_handle process_epoll_events(grpc_pollset* /*pollset*/) { // NOTE ON SYNCHRONIZATION: At any point of time, only the g_active_poller // (i.e the designated poller thread) will be calling this function. So there is -// no need for any synchronization when accesing fields in g_epoll_set +// no need for any synchronization when accessing fields in g_epoll_set static grpc_error_handle do_epoll_wait(grpc_pollset* ps, grpc_core::Timestamp deadline) { int r; @@ -1009,7 +1009,7 @@ static grpc_error_handle pollset_work(grpc_pollset* ps, // threads // process_epoll_events() returns very quickly: It just queues the work on - // exec_ctx but does not execute it (the actual exectution or more + // exec_ctx but does not execute it (the actual execution or more // accurately grpc_core::ExecCtx::Get()->Flush() happens in end_worker() // AFTER selecting a designated poller). So we are not waiting long periods // without a designated poller diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 055ca6efb5..532a611d33 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -30,7 +30,7 @@ #include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/ev_epoll1_linux.h" #include "src/core/lib/iomgr/ev_poll_posix.h" diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 39e0504d0d..3b571df568 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -27,7 +27,7 @@ #include #include "absl/log/log.h" -#include "src/core/lib/config/config_vars.h" +#include "src/core/config/config_vars.h" #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" diff --git a/src/core/lib/iomgr/iomgr_posix.cc b/src/core/lib/iomgr/iomgr_posix.cc index 1c810ba36b..e3c04c98d5 100644 --- a/src/core/lib/iomgr/iomgr_posix.cc +++ b/src/core/lib/iomgr/iomgr_posix.cc @@ -85,7 +85,8 @@ void grpc_set_default_iomgr_platform() { } bool grpc_iomgr_run_in_background() { - return grpc_event_engine_run_in_background(); + return grpc_core::IsEventEngineCallbackCqEnabled() || + grpc_event_engine_run_in_background(); } #endif // GRPC_POSIX_SOCKET_IOMGR diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc index 2d8716c54e..38e61b8122 100644 --- a/src/core/lib/iomgr/iomgr_windows.cc +++ b/src/core/lib/iomgr/iomgr_windows.cc @@ -107,6 +107,8 @@ void grpc_set_default_iomgr_platform() { grpc_set_iomgr_platform_vtable(&vtable); } -bool grpc_iomgr_run_in_background() { return false; } +bool grpc_iomgr_run_in_background() { + return grpc_core::IsEventEngineCallbackCqEnabled(); +} #endif // GRPC_WINSOCK_SOCKET diff --git a/src/core/lib/iomgr/nameser.h b/src/core/lib/iomgr/nameser.h index 98ac9b0f44..4d960f8899 100644 --- a/src/core/lib/iomgr/nameser.h +++ b/src/core/lib/iomgr/nameser.h @@ -82,7 +82,7 @@ typedef enum __ns_type { ns_t_cert = 37, // Certification record ns_t_a6 = 38, // IPv6 address (deprecates AAAA) ns_t_dname = 39, // Non-terminal DNAME (for IPv6) - ns_t_sink = 40, // Kitchen sink (experimentatl) + ns_t_sink = 40, // Kitchen sink (experimental) ns_t_opt = 41, // EDNS0 option (meta-RR) ns_t_apl = 42, // Address prefix list (RFC3123) ns_t_ds = 43, // Delegation Signer (RFC4034) diff --git a/src/core/lib/iomgr/port.h b/src/core/lib/iomgr/port.h index f4102a524a..4899e17346 100644 --- a/src/core/lib/iomgr/port.h +++ b/src/core/lib/iomgr/port.h @@ -40,8 +40,8 @@ #define GRPC_HAVE_IP_PKTINFO 1 #define GRPC_HAVE_MSG_NOSIGNAL 1 #define GRPC_HAVE_UNIX_SOCKET 1 -#if defined(LINUX_VERSION_CODE) && defined(__GLIBC_PREREQ) -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) && __GLIBC_PREREQ(2, 18) +#if defined(LINUX_VERSION_CODE) && defined(__NDK_MAJOR__) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) && __NDK_MAJOR__ >= 14 #define GRPC_HAVE_VSOCK 1 #endif #endif diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 9394ec7578..4a01cf5a96 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -346,7 +346,7 @@ int64_t grpc_tcp_client_create_from_prepared_fd( } if (err >= 0) { - // Connection already succeded. Return 0 to discourage any cancellation + // Connection already succeeded. Return 0 to discourage any cancellation // attempts. *ep = grpc_tcp_client_create_from_fd(fdobj, options, *addr_uri); grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, absl::OkStatus()); @@ -459,7 +459,7 @@ static bool tcp_cancel_connect(int64_t connection_handle) { ac->connect_cancelled = true; // Shutdown the fd. This would cause on_writable to run as soon as possible. // We dont need to pass a custom error here because it wont be used since - // the on_connect_closure is not run if connect cancellation is successfull. + // the on_connect_closure is not run if connect cancellation is successful. grpc_fd_shutdown(ac->fd, absl::OkStatus()); } bool done = (--ac->refs == 0); diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc index 5cc135d809..7d46475957 100644 --- a/src/core/lib/iomgr/tcp_client_windows.cc +++ b/src/core/lib/iomgr/tcp_client_windows.cc @@ -96,12 +96,12 @@ static void on_connect(void* acp, grpc_error_handle error) { if (error.ok()) { if (socket != NULL) { - DWORD transfered_bytes = 0; + DWORD transferred_bytes = 0; DWORD flags; BOOL wsa_success = WSAGetOverlappedResult(socket->socket, &socket->write_info.overlapped, - &transfered_bytes, FALSE, &flags); - CHECK_EQ(transfered_bytes, 0); + &transferred_bytes, FALSE, &flags); + CHECK_EQ(transferred_bytes, 0); if (!wsa_success) { error = GRPC_WSA_ERROR(WSAGetLastError(), "ConnectEx"); closesocket(socket->socket); diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 1b45c36eff..5cccb9aba7 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -325,7 +325,7 @@ class TcpZerocopySendCtx { size_t threshold_bytes() const { return threshold_bytes_; } // Expected to be called by handler reading messages from the err queue. - // It is used to indicate that some OMem meory is now available. It returns + // It is used to indicate that some OMem memory is now available. It returns // true to tell the caller to mark the file descriptor as immediately // writable. // diff --git a/src/core/lib/iomgr/tcp_posix.h b/src/core/lib/iomgr/tcp_posix.h index 2d3a094333..6927d8f1fe 100644 --- a/src/core/lib/iomgr/tcp_posix.h +++ b/src/core/lib/iomgr/tcp_posix.h @@ -38,7 +38,7 @@ #include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/socket_utils_posix.h" -/// Create a tcp endpoint given a file desciptor and a read slice size. +/// Create a tcp endpoint given a file descriptor and a read slice size. /// Takes ownership of \a fd. Takes ownership of the \a slice_allocator. grpc_endpoint* grpc_tcp_create(grpc_fd* fd, const grpc_core::PosixTcpOptions& options, diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index 2dad0bb1be..1f130682fb 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -88,7 +88,7 @@ static grpc_error_handle get_unused_port(int* port) { return *port <= 0 ? GRPC_ERROR_CREATE("Bad port") : absl::OkStatus(); } -static bool grpc_is_ipv4_availabile() { +static bool grpc_is_ipv4_available() { const int fd = socket(AF_INET, SOCK_DGRAM, 0); if (fd >= 0) close(fd); return fd >= 0; @@ -116,7 +116,7 @@ grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, VLOG(2) << "Picked unused port " << requested_port; } - static bool v4_available = grpc_is_ipv4_availabile(); + static bool v4_available = grpc_is_ipv4_available(); if (getifaddrs(&ifa) != 0 || ifa == nullptr) { return GRPC_OS_ERROR(errno, "getifaddrs"); diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index e5fcac6427..e4abafb296 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -371,7 +371,7 @@ static void on_accept(void* arg, grpc_error_handle error) { grpc_winsocket_callback_info* info = &sp->socket->read_info; grpc_endpoint* ep = NULL; grpc_resolved_address peer_name; - DWORD transfered_bytes; + DWORD transferred_bytes; DWORD flags; BOOL wsa_success; int err; @@ -392,9 +392,9 @@ static void on_accept(void* arg, grpc_error_handle error) { } // The IOCP notified us of a completed operation. Let's grab the results, // and act accordingly. - transfered_bytes = 0; + transferred_bytes = 0; wsa_success = WSAGetOverlappedResult(sock, &info->overlapped, - &transfered_bytes, FALSE, &flags); + &transferred_bytes, FALSE, &flags); if (!wsa_success) { if (!sp->shutting_down) { char* utf8_message = gpr_format_message(WSAGetLastError()); diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 3e5f604603..19f9e67f22 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -405,7 +405,7 @@ static void timer_init(grpc_timer* timer, grpc_core::Timestamp deadline, #else // On 32-bit systems, gpr_atm_no_barrier_store does not work on 64-bit // types (like grpc_core::Timestamp). So all reads and writes to - // g_shared_mutables.min_timer varialbe under g_shared_mutables.mu + // g_shared_mutables.min_timer variable under g_shared_mutables.mu g_shared_mutables.min_timer = deadline; #endif grpc_kick_poller(); diff --git a/src/core/lib/iomgr/timer_heap.cc b/src/core/lib/iomgr/timer_heap.cc index 617f76ade0..542de61d88 100644 --- a/src/core/lib/iomgr/timer_heap.cc +++ b/src/core/lib/iomgr/timer_heap.cc @@ -48,7 +48,7 @@ static void adjust_upwards(grpc_timer** first, uint32_t i, grpc_timer* t) { static void adjust_downwards(grpc_timer** first, uint32_t i, uint32_t length, grpc_timer* t) { for (;;) { - uint32_t left_child = 1u + 2u * i; + uint32_t left_child = 1u + (2u * i); if (left_child >= length) break; uint32_t right_child = left_child + 1; uint32_t next_i = right_child < length && first[left_child]->deadline > diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc index 9fc196e18a..e48aafaf36 100644 --- a/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -98,4 +98,4 @@ const grpc_wakeup_fd_vtable grpc_pipe_wakeup_fd_vtable = { pipe_init, pipe_consume, pipe_wakeup, pipe_destroy, pipe_check_availability}; -#endif // GPR_POSIX_WAKUP_FD +#endif // GRPC_POSIX_WAKEUP_FD diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h index 1bb57bb3f7..b635286cbb 100644 --- a/src/core/lib/promise/activity.h +++ b/src/core/lib/promise/activity.h @@ -121,11 +121,16 @@ class Waker { return wakeable_and_arg_.ActivityDebugTag(); } - std::string DebugString() { + std::string DebugString() const { return absl::StrFormat("Waker{%p, %d}", wakeable_and_arg_.wakeable, wakeable_and_arg_.wakeup_mask); } + template + friend void AbslStringify(Sink& sink, const Waker& waker) { + sink.Append(waker.DebugString()); + } + // This is for tests to assert that a waker is occupied or not. bool is_unwakeable() const { return wakeable_and_arg_.wakeable == promise_detail::unwakeable(); @@ -167,6 +172,11 @@ class IntraActivityWaiter { std::string DebugString() const; + template + friend void AbslStringify(Sink& sink, const IntraActivityWaiter& waker) { + sink.Append(waker.DebugString()); + } + private: WakeupMask wakeups_ = 0; }; @@ -203,7 +213,7 @@ class Activity : public Orphanable { // - assert that there is a current activity (and catch bugs if there's not) // - indicate to thread safety analysis that the current activity is indeed // locked - // - back up that assertation with a runtime check in debug builds (it's + // - back up that assertion with a runtime check in debug builds (it's // prohibitively expensive in non-debug builds) static Activity* current() { return g_current_activity_; } diff --git a/src/core/lib/promise/all_ok.h b/src/core/lib/promise/all_ok.h index 72d9d3815b..0ce363e383 100644 --- a/src/core/lib/promise/all_ok.h +++ b/src/core/lib/promise/all_ok.h @@ -24,6 +24,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "src/core/lib/promise/detail/join_state.h" +#include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/status_flag.h" @@ -77,10 +78,46 @@ class AllOk { // If any fail, cancel the rest and return the failure. // If all succeed, return Ok. template -GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto AllOk(Promises... promises) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline auto AllOk(Promises... promises) { return promise_detail::AllOk(std::move(promises)...); } +// Construct a promise for each element of the set, then run them all. +// If any fail, cancel the rest and return the failure. +// If all succeed, return Ok. +template +inline auto AllOkIter(Iter begin, Iter end, FactoryFn factory_fn) { + using Factory = + promise_detail::RepeatedPromiseFactory; + Factory factory(std::move(factory_fn)); + using Promise = typename Factory::Promise; + std::vector promises; + std::vector done; + for (auto it = begin; it != end; ++it) { + promises.emplace_back(factory.Make(*it)); + done.push_back(false); + } + return [promises = std::move(promises), + done = std::move(done)]() mutable -> Poll { + using Traits = promise_detail::AllOkTraits; + bool still_working = false; + for (size_t i = 0; i < promises.size(); ++i) { + if (done[i]) continue; + auto p = promises[i](); + if (auto* r = p.value_if_ready()) { + if (!Traits::IsOk(*r)) { + return Traits::template EarlyReturn(std::move(*r)); + } + done[i] = true; + } else { + still_working = true; + } + } + if (still_working) return Pending{}; + return Traits::FinalReturn(); + }; +} + } // namespace grpc_core #endif // GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H diff --git a/src/core/lib/promise/cancel_callback.h b/src/core/lib/promise/cancel_callback.h index ed999c293f..9ff66231a4 100644 --- a/src/core/lib/promise/cancel_callback.h +++ b/src/core/lib/promise/cancel_callback.h @@ -69,8 +69,8 @@ class Handler { // completion. // Returns a promise with the same result type as main_fn. template -GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto OnCancel(MainFn main_fn, - CancelFn cancel_fn) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline auto OnCancel(MainFn main_fn, + CancelFn cancel_fn) { return [on_cancel = cancel_callback_detail::Handler(std::move(cancel_fn)), main_fn = promise_detail::PromiseLike( @@ -87,8 +87,8 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto OnCancel(MainFn main_fn, // resulting promise. If the factory is dropped without being called, cancel_fn // is called. template -GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto OnCancelFactory(MainFn main_fn, - CancelFn cancel_fn) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline 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 a0eed9396e..65ee6f1a4a 100644 --- a/src/core/lib/promise/context.h +++ b/src/core/lib/promise/context.h @@ -105,13 +105,13 @@ class WithContext { // Return true if a context of type T is currently active. template -GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION bool HasContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool HasContext() { return promise_detail::Context::get() != nullptr; } // Retrieve the current value of a context, or abort if the value is unset. template -GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* GetContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline T* GetContext() { auto* p = promise_detail::Context::get(); DCHECK_NE(p, nullptr); return p; @@ -119,12 +119,12 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* GetContext() { // Retrieve the current value of a context, or nullptr if the value is unset. template -GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION T* MaybeGetContext() { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline T* MaybeGetContext() { return promise_detail::Context::get(); } template -GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION void SetContext(T* p) { +GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void SetContext(T* p) { promise_detail::Context::set(p); } diff --git a/src/core/lib/promise/detail/basic_seq.h b/src/core/lib/promise/detail/basic_seq.h index d48dcd6150..ce36692efa 100644 --- a/src/core/lib/promise/detail/basic_seq.h +++ b/src/core/lib/promise/detail/basic_seq.h @@ -17,35 +17,41 @@ #include +#include "src/core/lib/promise/detail/promise_factory.h" #include "src/core/lib/promise/poll.h" #include "src/core/util/construct_destruct.h" namespace grpc_core { namespace promise_detail { +template +auto BindFactoryFnArgs(FactoryFn fn) { + return [fn = std::move(fn)](auto x) mutable { + return fn(std::get<0>(x), std::move(std::get<1>(x))); + }; +} + // Models a sequence of unknown size // At each element, the accumulator A and the current value V is passed to some // function of type IterTraits::Factory as f(V, IterTraits::Argument); f is // expected to return a promise that resolves to IterTraits::Wrapped. -template +template