grpc 1.68.1 → 1.69.0.pre1

data/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

data/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_ */

data/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_ */

data/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

data/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_ */

data/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_ */

data/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

data/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_ */

data/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_ */