From 47718a69a97ce72b00821386663fb8f46b128606 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 14 Nov 2016 14:48:42 -0800 Subject: [PATCH] Add method config stuff --- src/core/lib/transport/static_metadata.c | 320 +++++++++++---------- src/core/lib/transport/static_metadata.h | 116 ++++---- test/core/end2end/fuzzers/hpack.dictionary | 4 + tools/codegen/core/gen_static_metadata.py | 7 + 4 files changed, 244 insertions(+), 203 deletions(-) diff --git a/src/core/lib/transport/static_metadata.c b/src/core/lib/transport/static_metadata.c index 1d72646a975..e24f3fa55e2 100644 --- a/src/core/lib/transport/static_metadata.c +++ b/src/core/lib/transport/static_metadata.c @@ -66,43 +66,49 @@ static uint8_t g_raw_bytes[] = { 112, 101, 99, 116, 101, 120, 112, 105, 114, 101, 115, 102, 114, 111, 109, 71, 69, 84, 103, 114, 112, 99, 103, 114, 112, 99, 45, 97, 99, 99, 101, 112, 116, 45, 101, 110, 99, 111, 100, 105, 110, 103, 103, 114, 112, - 99, 45, 101, 110, 99, 111, 100, 105, 110, 103, 103, 114, 112, 99, 45, - 105, 110, 116, 101, 114, 110, 97, 108, 45, 101, 110, 99, 111, 100, 105, - 110, 103, 45, 114, 101, 113, 117, 101, 115, 116, 103, 114, 112, 99, 45, - 109, 101, 115, 115, 97, 103, 101, 103, 114, 112, 99, 45, 112, 97, 121, - 108, 111, 97, 100, 45, 98, 105, 110, 103, 114, 112, 99, 45, 115, 116, - 97, 116, 115, 45, 98, 105, 110, 103, 114, 112, 99, 45, 115, 116, 97, - 116, 117, 115, 103, 114, 112, 99, 45, 116, 105, 109, 101, 111, 117, 116, - 103, 114, 112, 99, 45, 116, 114, 97, 99, 105, 110, 103, 45, 98, 105, - 110, 103, 122, 105, 112, 103, 122, 105, 112, 44, 32, 100, 101, 102, 108, - 97, 116, 101, 104, 111, 115, 116, 104, 116, 116, 112, 104, 116, 116, 112, - 115, 105, 100, 101, 110, 116, 105, 116, 121, 105, 100, 101, 110, 116, 105, - 116, 121, 44, 100, 101, 102, 108, 97, 116, 101, 105, 100, 101, 110, 116, - 105, 116, 121, 44, 100, 101, 102, 108, 97, 116, 101, 44, 103, 122, 105, - 112, 105, 100, 101, 110, 116, 105, 116, 121, 44, 103, 122, 105, 112, 105, - 102, 45, 109, 97, 116, 99, 104, 105, 102, 45, 109, 111, 100, 105, 102, - 105, 101, 100, 45, 115, 105, 110, 99, 101, 105, 102, 45, 110, 111, 110, - 101, 45, 109, 97, 116, 99, 104, 105, 102, 45, 114, 97, 110, 103, 101, - 105, 102, 45, 117, 110, 109, 111, 100, 105, 102, 105, 101, 100, 45, 115, - 105, 110, 99, 101, 108, 97, 115, 116, 45, 109, 111, 100, 105, 102, 105, - 101, 100, 108, 98, 45, 99, 111, 115, 116, 45, 98, 105, 110, 108, 98, - 45, 116, 111, 107, 101, 110, 108, 105, 110, 107, 108, 111, 99, 97, 116, - 105, 111, 110, 109, 97, 120, 45, 102, 111, 114, 119, 97, 114, 100, 115, - 58, 109, 101, 116, 104, 111, 100, 58, 112, 97, 116, 104, 80, 79, 83, - 84, 112, 114, 111, 120, 121, 45, 97, 117, 116, 104, 101, 110, 116, 105, - 99, 97, 116, 101, 112, 114, 111, 120, 121, 45, 97, 117, 116, 104, 111, - 114, 105, 122, 97, 116, 105, 111, 110, 80, 85, 84, 114, 97, 110, 103, - 101, 114, 101, 102, 101, 114, 101, 114, 114, 101, 102, 114, 101, 115, 104, - 114, 101, 116, 114, 121, 45, 97, 102, 116, 101, 114, 58, 115, 99, 104, - 101, 109, 101, 115, 101, 114, 118, 101, 114, 115, 101, 116, 45, 99, 111, - 111, 107, 105, 101, 47, 47, 105, 110, 100, 101, 120, 46, 104, 116, 109, - 108, 58, 115, 116, 97, 116, 117, 115, 115, 116, 114, 105, 99, 116, 45, - 116, 114, 97, 110, 115, 112, 111, 114, 116, 45, 115, 101, 99, 117, 114, - 105, 116, 121, 116, 101, 116, 114, 97, 105, 108, 101, 114, 115, 116, 114, - 97, 110, 115, 102, 101, 114, 45, 101, 110, 99, 111, 100, 105, 110, 103, - 117, 115, 101, 114, 45, 97, 103, 101, 110, 116, 118, 97, 114, 121, 118, - 105, 97, 119, 119, 119, 45, 97, 117, 116, 104, 101, 110, 116, 105, 99, - 97, 116, 101}; + 99, 46, 109, 97, 120, 95, 114, 101, 113, 117, 101, 115, 116, 95, 109, + 101, 115, 115, 97, 103, 101, 95, 98, 121, 116, 101, 115, 103, 114, 112, + 99, 46, 109, 97, 120, 95, 114, 101, 115, 112, 111, 110, 115, 101, 95, + 109, 101, 115, 115, 97, 103, 101, 95, 98, 121, 116, 101, 115, 103, 114, + 112, 99, 46, 116, 105, 109, 101, 111, 117, 116, 103, 114, 112, 99, 46, + 119, 97, 105, 116, 95, 102, 111, 114, 95, 114, 101, 97, 100, 121, 103, + 114, 112, 99, 45, 101, 110, 99, 111, 100, 105, 110, 103, 103, 114, 112, + 99, 45, 105, 110, 116, 101, 114, 110, 97, 108, 45, 101, 110, 99, 111, + 100, 105, 110, 103, 45, 114, 101, 113, 117, 101, 115, 116, 103, 114, 112, + 99, 45, 109, 101, 115, 115, 97, 103, 101, 103, 114, 112, 99, 45, 112, + 97, 121, 108, 111, 97, 100, 45, 98, 105, 110, 103, 114, 112, 99, 45, + 115, 116, 97, 116, 115, 45, 98, 105, 110, 103, 114, 112, 99, 45, 115, + 116, 97, 116, 117, 115, 103, 114, 112, 99, 45, 116, 105, 109, 101, 111, + 117, 116, 103, 114, 112, 99, 45, 116, 114, 97, 99, 105, 110, 103, 45, + 98, 105, 110, 103, 122, 105, 112, 103, 122, 105, 112, 44, 32, 100, 101, + 102, 108, 97, 116, 101, 104, 111, 115, 116, 104, 116, 116, 112, 104, 116, + 116, 112, 115, 105, 100, 101, 110, 116, 105, 116, 121, 105, 100, 101, 110, + 116, 105, 116, 121, 44, 100, 101, 102, 108, 97, 116, 101, 105, 100, 101, + 110, 116, 105, 116, 121, 44, 100, 101, 102, 108, 97, 116, 101, 44, 103, + 122, 105, 112, 105, 100, 101, 110, 116, 105, 116, 121, 44, 103, 122, 105, + 112, 105, 102, 45, 109, 97, 116, 99, 104, 105, 102, 45, 109, 111, 100, + 105, 102, 105, 101, 100, 45, 115, 105, 110, 99, 101, 105, 102, 45, 110, + 111, 110, 101, 45, 109, 97, 116, 99, 104, 105, 102, 45, 114, 97, 110, + 103, 101, 105, 102, 45, 117, 110, 109, 111, 100, 105, 102, 105, 101, 100, + 45, 115, 105, 110, 99, 101, 108, 97, 115, 116, 45, 109, 111, 100, 105, + 102, 105, 101, 100, 108, 98, 45, 99, 111, 115, 116, 45, 98, 105, 110, + 108, 98, 45, 116, 111, 107, 101, 110, 108, 105, 110, 107, 108, 111, 99, + 97, 116, 105, 111, 110, 109, 97, 120, 45, 102, 111, 114, 119, 97, 114, + 100, 115, 58, 109, 101, 116, 104, 111, 100, 58, 112, 97, 116, 104, 80, + 79, 83, 84, 112, 114, 111, 120, 121, 45, 97, 117, 116, 104, 101, 110, + 116, 105, 99, 97, 116, 101, 112, 114, 111, 120, 121, 45, 97, 117, 116, + 104, 111, 114, 105, 122, 97, 116, 105, 111, 110, 80, 85, 84, 114, 97, + 110, 103, 101, 114, 101, 102, 101, 114, 101, 114, 114, 101, 102, 114, 101, + 115, 104, 114, 101, 116, 114, 121, 45, 97, 102, 116, 101, 114, 58, 115, + 99, 104, 101, 109, 101, 115, 101, 114, 118, 101, 114, 115, 101, 116, 45, + 99, 111, 111, 107, 105, 101, 47, 47, 105, 110, 100, 101, 120, 46, 104, + 116, 109, 108, 58, 115, 116, 97, 116, 117, 115, 115, 116, 114, 105, 99, + 116, 45, 116, 114, 97, 110, 115, 112, 111, 114, 116, 45, 115, 101, 99, + 117, 114, 105, 116, 121, 116, 101, 116, 114, 97, 105, 108, 101, 114, 115, + 116, 114, 97, 110, 115, 102, 101, 114, 45, 101, 110, 99, 111, 100, 105, + 110, 103, 117, 115, 101, 114, 45, 97, 103, 101, 110, 116, 118, 97, 114, + 121, 118, 105, 97, 119, 119, 119, 45, 97, 117, 116, 104, 101, 110, 116, + 105, 99, 97, 116, 101}; static void static_ref(void *unused) {} static void static_unref(grpc_exec_ctx *exec_ctx, void *unused) {} @@ -196,109 +202,117 @@ const grpc_slice grpc_static_slice_table[GRPC_STATIC_MDSTR_COUNT] = { {.refcount = &g_refcnt, .data.refcounted = {.bytes = g_raw_bytes + 337, .length = 20}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 357, .length = 13}}, + .data.refcounted = {.bytes = g_raw_bytes + 357, .length = 30}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 370, .length = 30}}, + .data.refcounted = {.bytes = g_raw_bytes + 387, .length = 31}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 400, .length = 12}}, + .data.refcounted = {.bytes = g_raw_bytes + 418, .length = 12}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 412, .length = 16}}, + .data.refcounted = {.bytes = g_raw_bytes + 430, .length = 19}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 428, .length = 14}}, + .data.refcounted = {.bytes = g_raw_bytes + 449, .length = 13}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 442, .length = 11}}, + .data.refcounted = {.bytes = g_raw_bytes + 462, .length = 30}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 453, .length = 12}}, + .data.refcounted = {.bytes = g_raw_bytes + 492, .length = 12}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 465, .length = 16}}, + .data.refcounted = {.bytes = g_raw_bytes + 504, .length = 16}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 481, .length = 4}}, + .data.refcounted = {.bytes = g_raw_bytes + 520, .length = 14}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 485, .length = 13}}, + .data.refcounted = {.bytes = g_raw_bytes + 534, .length = 11}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 498, .length = 4}}, + .data.refcounted = {.bytes = g_raw_bytes + 545, .length = 12}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 502, .length = 4}}, + .data.refcounted = {.bytes = g_raw_bytes + 557, .length = 16}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 506, .length = 5}}, + .data.refcounted = {.bytes = g_raw_bytes + 573, .length = 4}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 511, .length = 8}}, + .data.refcounted = {.bytes = g_raw_bytes + 577, .length = 13}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 519, .length = 16}}, + .data.refcounted = {.bytes = g_raw_bytes + 590, .length = 4}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 535, .length = 21}}, + .data.refcounted = {.bytes = g_raw_bytes + 594, .length = 4}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 556, .length = 13}}, + .data.refcounted = {.bytes = g_raw_bytes + 598, .length = 5}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 569, .length = 8}}, + .data.refcounted = {.bytes = g_raw_bytes + 603, .length = 8}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 577, .length = 17}}, + .data.refcounted = {.bytes = g_raw_bytes + 611, .length = 16}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 594, .length = 13}}, + .data.refcounted = {.bytes = g_raw_bytes + 627, .length = 21}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 607, .length = 8}}, + .data.refcounted = {.bytes = g_raw_bytes + 648, .length = 13}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 615, .length = 19}}, + .data.refcounted = {.bytes = g_raw_bytes + 661, .length = 8}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 634, .length = 13}}, + .data.refcounted = {.bytes = g_raw_bytes + 669, .length = 17}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 647, .length = 11}}, + .data.refcounted = {.bytes = g_raw_bytes + 686, .length = 13}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 658, .length = 8}}, + .data.refcounted = {.bytes = g_raw_bytes + 699, .length = 8}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 666, .length = 4}}, + .data.refcounted = {.bytes = g_raw_bytes + 707, .length = 19}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 670, .length = 8}}, + .data.refcounted = {.bytes = g_raw_bytes + 726, .length = 13}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 678, .length = 12}}, + .data.refcounted = {.bytes = g_raw_bytes + 739, .length = 11}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 690, .length = 7}}, + .data.refcounted = {.bytes = g_raw_bytes + 750, .length = 8}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 697, .length = 5}}, + .data.refcounted = {.bytes = g_raw_bytes + 758, .length = 4}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 702, .length = 4}}, + .data.refcounted = {.bytes = g_raw_bytes + 762, .length = 8}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 706, .length = 18}}, + .data.refcounted = {.bytes = g_raw_bytes + 770, .length = 12}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 724, .length = 19}}, + .data.refcounted = {.bytes = g_raw_bytes + 782, .length = 7}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 743, .length = 3}}, + .data.refcounted = {.bytes = g_raw_bytes + 789, .length = 5}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 746, .length = 5}}, + .data.refcounted = {.bytes = g_raw_bytes + 794, .length = 4}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 751, .length = 7}}, + .data.refcounted = {.bytes = g_raw_bytes + 798, .length = 18}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 758, .length = 7}}, + .data.refcounted = {.bytes = g_raw_bytes + 816, .length = 19}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 765, .length = 11}}, + .data.refcounted = {.bytes = g_raw_bytes + 835, .length = 3}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 776, .length = 7}}, + .data.refcounted = {.bytes = g_raw_bytes + 838, .length = 5}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 783, .length = 6}}, + .data.refcounted = {.bytes = g_raw_bytes + 843, .length = 7}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 789, .length = 10}}, + .data.refcounted = {.bytes = g_raw_bytes + 850, .length = 7}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 799, .length = 1}}, + .data.refcounted = {.bytes = g_raw_bytes + 857, .length = 11}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 800, .length = 11}}, + .data.refcounted = {.bytes = g_raw_bytes + 868, .length = 7}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 811, .length = 7}}, + .data.refcounted = {.bytes = g_raw_bytes + 875, .length = 6}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 818, .length = 25}}, + .data.refcounted = {.bytes = g_raw_bytes + 881, .length = 10}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 843, .length = 2}}, + .data.refcounted = {.bytes = g_raw_bytes + 891, .length = 1}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 845, .length = 8}}, + .data.refcounted = {.bytes = g_raw_bytes + 892, .length = 11}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 853, .length = 17}}, + .data.refcounted = {.bytes = g_raw_bytes + 903, .length = 7}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 870, .length = 10}}, + .data.refcounted = {.bytes = g_raw_bytes + 910, .length = 25}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 880, .length = 4}}, + .data.refcounted = {.bytes = g_raw_bytes + 935, .length = 2}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 884, .length = 3}}, + .data.refcounted = {.bytes = g_raw_bytes + 937, .length = 8}}, {.refcount = &g_refcnt, - .data.refcounted = {.bytes = g_raw_bytes + 887, .length = 16}}, + .data.refcounted = {.bytes = g_raw_bytes + 945, .length = 17}}, + {.refcount = &g_refcnt, + .data.refcounted = {.bytes = g_raw_bytes + 962, .length = 10}}, + {.refcount = &g_refcnt, + .data.refcounted = {.bytes = g_raw_bytes + 972, .length = 4}}, + {.refcount = &g_refcnt, + .data.refcounted = {.bytes = g_raw_bytes + 976, .length = 3}}, + {.refcount = &g_refcnt, + .data.refcounted = {.bytes = g_raw_bytes + 979, .length = 16}}, }; static const uint8_t g_revmap[] = { @@ -326,43 +340,49 @@ static const uint8_t g_revmap[] = { 255, 255, 255, 255, 36, 255, 255, 255, 255, 255, 255, 37, 255, 255, 255, 38, 255, 255, 39, 255, 255, 255, 40, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 41, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 42, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 43, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 44, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 45, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 46, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 47, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 48, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 49, 255, 255, 255, 50, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 51, 255, 255, 255, 52, 255, 255, 255, 53, 255, 255, 255, - 255, 54, 255, 255, 255, 255, 255, 255, 255, 55, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 56, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 42, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 43, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 44, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 45, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 46, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 57, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 58, - 255, 255, 255, 255, 255, 255, 255, 59, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 60, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 61, 255, 255, 255, 255, 255, 255, 255, - 62, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 63, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 64, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 65, 255, - 255, 255, 255, 255, 255, 255, 66, 255, 255, 255, 67, 255, 255, 255, 255, - 255, 255, 255, 68, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 69, 255, 255, 255, 255, 255, 255, 70, 255, 255, 255, 255, 71, 255, 255, - 255, 72, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 73, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 74, 255, 255, 75, 255, 255, 255, - 255, 76, 255, 255, 255, 255, 255, 255, 77, 255, 255, 255, 255, 255, 255, - 78, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 79, 255, 255, 255, - 255, 255, 255, 80, 255, 255, 255, 255, 255, 81, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 82, 83, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 84, 255, 255, 255, 255, 255, 255, 85, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 47, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 48, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 49, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 50, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 51, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 52, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 53, 255, 255, 255, 54, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 55, 255, 255, 255, 56, 255, 255, 255, 57, 255, + 255, 255, 255, 58, 255, 255, 255, 255, 255, 255, 255, 59, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 60, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 86, 255, 87, 255, 255, 255, 255, 255, 255, 255, 88, 255, + 255, 255, 255, 61, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 62, 255, 255, 255, 255, 255, 255, 255, 63, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 64, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 65, 255, 255, 255, 255, 255, + 255, 255, 66, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 67, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 68, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 69, 255, 255, 255, 255, 255, 255, 255, 70, 255, 255, 255, 71, 255, 255, + 255, 255, 255, 255, 255, 72, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 73, 255, 255, 255, 255, 255, 255, 74, 255, 255, 255, 255, 75, + 255, 255, 255, 76, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 77, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 78, 255, 255, 79, 255, + 255, 255, 255, 80, 255, 255, 255, 255, 255, 255, 81, 255, 255, 255, 255, + 255, 255, 82, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 83, 255, + 255, 255, 255, 255, 255, 84, 255, 255, 255, 255, 255, 85, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 86, 87, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 88, 255, 255, 255, 255, 255, 255, 89, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 89, 255, 255, 255, 255, 255, 255, 255, 255, 255, 90, 255, 255, 255, 91, - 255, 255, 92, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255}; + 255, 255, 255, 255, 255, 90, 255, 91, 255, 255, 255, 255, 255, 255, 255, + 92, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 93, 255, 255, 255, 255, 255, 255, 255, 255, 255, 94, 255, 255, + 255, 95, 255, 255, 96, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255}; int grpc_static_metadata_index(grpc_slice slice) { if (GRPC_SLICE_LENGTH(slice) == 0) return 33; @@ -382,62 +402,62 @@ uintptr_t grpc_static_mdelem_user_data[GRPC_STATIC_MDELEM_COUNT] = { #define ELEMS_PHASHLEN 0x40 #define ELEMS_PHASHNKEYS 81 #define ELEMS_PHASHRANGE 128 -#define ELEMS_PHASHSALT 0x13c6ef372 +#define ELEMS_PHASHSALT 0x9e3779b9 static const uint8_t elems_tab[] = { - 47, 28, 47, 1, 47, 76, 76, 0, 1, 119, 61, 60, 47, 61, 76, 0, - 0, 32, 61, 76, 0, 0, 1, 0, 0, 0, 0, 0, 0, 101, 0, 0, - 0, 0, 47, 76, 122, 10, 76, 46, 87, 119, 25, 4, 0, 47, 0, 44, - 20, 120, 4, 79, 0, 0, 122, 88, 80, 20, 51, 65, 0, 0, 0, 0, + 47, 1, 61, 0, 32, 0, 47, 1, 37, 0, 0, 0, 47, 61, 76, 0, + 76, 0, 61, 0, 32, 37, 51, 0, 47, 47, 79, 4, 76, 1, 0, 0, + 0, 76, 0, 47, 85, 34, 0, 10, 0, 28, 0, 76, 0, 61, 0, 0, + 46, 4, 12, 47, 88, 28, 61, 79, 28, 70, 0, 68, 85, 0, 87, 0, }; static uint32_t elems_phash(uint32_t val) { - val -= 963; + val -= 1003; uint32_t a, b, rsl; - b = ((val << 19) >> 26); - a = (val & 0x3f); + b = (val & 0x3f); + a = ((val << 18) >> 26); rsl = (a ^ elems_tab[b]); return rsl; } static const uint16_t elem_keys[] = { - 3844, 1521, 2544, 7194, 7815, 7816, 7817, 7818, 7819, 7820, 7821, 6357, - 6822, 5706, 2358, 3381, 1428, 6488, 3862, 7386, 2622, 6078, 7101, 1166, - 3195, 3867, 2730, 1335, 6491, 2079, 8496, 5427, 7399, 7400, 1893, 8403, - 3751, 3752, 1149, 8310, 3288, 6729, 7473, 2265, 2451, 6455, 5799, 963, - 5985, 7008, 1056, 4278, 4279, 4280, 3769, 2637, 1242, 6592, 6593, 3774, - 3775, 3776, 3777, 1986, 4776, 5520, 6264, 3474, 7566, 7938, 8217, 1614, - 2823, 1800, 8085, 8589, 7287, 5892, 2172, 6171, 5613, 0, 0, 0, + 1218, 8544, 2652, 1973, 7264, 2458, 2734, 3933, 1682, 6435, 3912, 3941, + 4396, 4418, 4850, 4852, 7890, 8541, 6726, 9345, 6338, 6629, 6920, 3939, + 7156, 8540, 8108, 8090, 8181, 8666, 8821, 1876, 8545, 1391, 8957, 1488, + 7405, 7265, 3331, 2943, 2846, 6241, 4851, 2167, 5368, 1585, 1294, 1003, + 9054, 6144, 8542, 8539, 8107, 7793, 7502, 7159, 7696, 2264, 6532, 2749, + 9248, 1197, 7987, 9151, 7017, 4423, 7119, 6823, 3938, 8543, 3525, 3911, + 2070, 2361, 2555, 6047, 1100, 3940, 3622, 3428, 8278, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; static const uint8_t elem_idxs[] = { - 33, 7, 17, 60, 67, 68, 69, 70, 71, 72, 73, 50, 57, 43, 15, 24, 6, - 52, 34, 62, 18, 47, 59, 3, 22, 35, 20, 5, 53, 12, 79, 40, 63, 64, - 10, 78, 26, 27, 2, 77, 23, 56, 65, 14, 16, 51, 44, 1, 46, 58, 0, - 36, 37, 38, 28, 19, 4, 54, 55, 29, 30, 31, 32, 11, 39, 41, 49, 25, - 66, 74, 76, 8, 21, 9, 75, 80, 61, 45, 13, 48, 42}; + 3, 72, 17, 10, 54, 15, 18, 28, 8, 44, 27, 32, 33, 34, 36, 38, 60, + 69, 47, 80, 43, 46, 49, 30, 52, 68, 64, 62, 65, 74, 75, 9, 73, 5, + 76, 6, 56, 55, 22, 21, 20, 42, 37, 12, 39, 7, 4, 1, 77, 41, 70, + 67, 63, 59, 57, 53, 58, 13, 45, 19, 79, 2, 61, 78, 50, 35, 51, 48, + 29, 71, 24, 26, 11, 14, 16, 40, 0, 31, 25, 23, 66}; grpc_mdelem *grpc_static_mdelem_for_static_strings(int a, int b) { if (a == -1 || b == -1) return NULL; - uint32_t k = (uint32_t)(a * 93 + b); + uint32_t k = (uint32_t)(a * 97 + b); uint32_t h = elems_phash(k); return elem_keys[h] == k ? &grpc_static_mdelem_table[elem_idxs[h]] : NULL; } const uint8_t grpc_static_metadata_elem_indices[GRPC_STATIC_MDELEM_COUNT * 2] = - {11, 33, 10, 33, 12, 33, 12, 50, 13, 33, 14, 33, 15, 33, 16, 33, 17, 33, + {11, 33, 10, 33, 12, 33, 12, 54, 13, 33, 14, 33, 15, 33, 16, 33, 17, 33, 19, 33, 20, 33, 21, 33, 22, 33, 23, 33, 24, 33, 25, 33, 26, 33, 27, 33, 28, 18, 28, 33, 29, 33, 30, 33, 34, 33, 35, 33, 36, 33, 37, 33, 40, 31, - 40, 32, 40, 49, 40, 54, 40, 55, 40, 56, 40, 57, 41, 31, 41, 49, 41, 54, - 46, 0, 46, 1, 46, 2, 51, 33, 58, 33, 59, 33, 60, 33, 61, 33, 62, 33, - 63, 33, 64, 33, 65, 33, 66, 33, 67, 33, 68, 33, 69, 38, 69, 71, 69, 74, - 70, 82, 70, 83, 72, 33, 73, 33, 75, 33, 76, 33, 77, 33, 78, 33, 79, 39, - 79, 52, 79, 53, 80, 33, 81, 33, 84, 3, 84, 4, 84, 5, 84, 6, 84, 7, - 84, 8, 84, 9, 85, 33, 86, 87, 88, 33, 89, 33, 90, 33, 91, 33, 92, 33}; + 40, 32, 40, 53, 40, 58, 40, 59, 40, 60, 40, 61, 45, 31, 45, 53, 45, 58, + 50, 0, 50, 1, 50, 2, 55, 33, 62, 33, 63, 33, 64, 33, 65, 33, 66, 33, + 67, 33, 68, 33, 69, 33, 70, 33, 71, 33, 72, 33, 73, 38, 73, 75, 73, 78, + 74, 86, 74, 87, 76, 33, 77, 33, 79, 33, 80, 33, 81, 33, 82, 33, 83, 39, + 83, 56, 83, 57, 84, 33, 85, 33, 88, 3, 88, 4, 88, 5, 88, 6, 88, 7, + 88, 8, 88, 9, 89, 33, 90, 91, 92, 33, 93, 33, 94, 33, 95, 33, 96, 33}; const uint8_t grpc_static_accept_encoding_metadata[8] = {0, 29, 26, 30, 28, 32, 27, 31}; diff --git a/src/core/lib/transport/static_metadata.h b/src/core/lib/transport/static_metadata.h index cbe721f4078..c6348a52803 100644 --- a/src/core/lib/transport/static_metadata.h +++ b/src/core/lib/transport/static_metadata.h @@ -44,7 +44,7 @@ #include "src/core/lib/transport/metadata.h" -#define GRPC_STATIC_MDSTR_COUNT 93 +#define GRPC_STATIC_MDSTR_COUNT 97 extern const grpc_slice grpc_static_slice_table[GRPC_STATIC_MDSTR_COUNT]; /* "0" */ #define GRPC_MDSTR_0 (grpc_static_slice_table[0]) @@ -128,111 +128,121 @@ extern const grpc_slice grpc_static_slice_table[GRPC_STATIC_MDSTR_COUNT]; #define GRPC_MDSTR_GRPC (grpc_static_slice_table[39]) /* "grpc-accept-encoding" */ #define GRPC_MDSTR_GRPC_ACCEPT_ENCODING (grpc_static_slice_table[40]) +/* "grpc.max_request_message_bytes" */ +#define GRPC_MDSTR_GRPC_DOT_MAX_REQUEST_MESSAGE_BYTES \ + (grpc_static_slice_table[41]) +/* "grpc.max_response_message_bytes" */ +#define GRPC_MDSTR_GRPC_DOT_MAX_RESPONSE_MESSAGE_BYTES \ + (grpc_static_slice_table[42]) +/* "grpc.timeout" */ +#define GRPC_MDSTR_GRPC_DOT_TIMEOUT (grpc_static_slice_table[43]) +/* "grpc.wait_for_ready" */ +#define GRPC_MDSTR_GRPC_DOT_WAIT_FOR_READY (grpc_static_slice_table[44]) /* "grpc-encoding" */ -#define GRPC_MDSTR_GRPC_ENCODING (grpc_static_slice_table[41]) +#define GRPC_MDSTR_GRPC_ENCODING (grpc_static_slice_table[45]) /* "grpc-internal-encoding-request" */ -#define GRPC_MDSTR_GRPC_INTERNAL_ENCODING_REQUEST (grpc_static_slice_table[42]) +#define GRPC_MDSTR_GRPC_INTERNAL_ENCODING_REQUEST (grpc_static_slice_table[46]) /* "grpc-message" */ -#define GRPC_MDSTR_GRPC_MESSAGE (grpc_static_slice_table[43]) +#define GRPC_MDSTR_GRPC_MESSAGE (grpc_static_slice_table[47]) /* "grpc-payload-bin" */ -#define GRPC_MDSTR_GRPC_PAYLOAD_BIN (grpc_static_slice_table[44]) +#define GRPC_MDSTR_GRPC_PAYLOAD_BIN (grpc_static_slice_table[48]) /* "grpc-stats-bin" */ -#define GRPC_MDSTR_GRPC_STATS_BIN (grpc_static_slice_table[45]) +#define GRPC_MDSTR_GRPC_STATS_BIN (grpc_static_slice_table[49]) /* "grpc-status" */ -#define GRPC_MDSTR_GRPC_STATUS (grpc_static_slice_table[46]) +#define GRPC_MDSTR_GRPC_STATUS (grpc_static_slice_table[50]) /* "grpc-timeout" */ -#define GRPC_MDSTR_GRPC_TIMEOUT (grpc_static_slice_table[47]) +#define GRPC_MDSTR_GRPC_TIMEOUT (grpc_static_slice_table[51]) /* "grpc-tracing-bin" */ -#define GRPC_MDSTR_GRPC_TRACING_BIN (grpc_static_slice_table[48]) +#define GRPC_MDSTR_GRPC_TRACING_BIN (grpc_static_slice_table[52]) /* "gzip" */ -#define GRPC_MDSTR_GZIP (grpc_static_slice_table[49]) +#define GRPC_MDSTR_GZIP (grpc_static_slice_table[53]) /* "gzip, deflate" */ -#define GRPC_MDSTR_GZIP_COMMA_DEFLATE (grpc_static_slice_table[50]) +#define GRPC_MDSTR_GZIP_COMMA_DEFLATE (grpc_static_slice_table[54]) /* "host" */ -#define GRPC_MDSTR_HOST (grpc_static_slice_table[51]) +#define GRPC_MDSTR_HOST (grpc_static_slice_table[55]) /* "http" */ -#define GRPC_MDSTR_HTTP (grpc_static_slice_table[52]) +#define GRPC_MDSTR_HTTP (grpc_static_slice_table[56]) /* "https" */ -#define GRPC_MDSTR_HTTPS (grpc_static_slice_table[53]) +#define GRPC_MDSTR_HTTPS (grpc_static_slice_table[57]) /* "identity" */ -#define GRPC_MDSTR_IDENTITY (grpc_static_slice_table[54]) +#define GRPC_MDSTR_IDENTITY (grpc_static_slice_table[58]) /* "identity,deflate" */ -#define GRPC_MDSTR_IDENTITY_COMMA_DEFLATE (grpc_static_slice_table[55]) +#define GRPC_MDSTR_IDENTITY_COMMA_DEFLATE (grpc_static_slice_table[59]) /* "identity,deflate,gzip" */ #define GRPC_MDSTR_IDENTITY_COMMA_DEFLATE_COMMA_GZIP \ - (grpc_static_slice_table[56]) + (grpc_static_slice_table[60]) /* "identity,gzip" */ -#define GRPC_MDSTR_IDENTITY_COMMA_GZIP (grpc_static_slice_table[57]) +#define GRPC_MDSTR_IDENTITY_COMMA_GZIP (grpc_static_slice_table[61]) /* "if-match" */ -#define GRPC_MDSTR_IF_MATCH (grpc_static_slice_table[58]) +#define GRPC_MDSTR_IF_MATCH (grpc_static_slice_table[62]) /* "if-modified-since" */ -#define GRPC_MDSTR_IF_MODIFIED_SINCE (grpc_static_slice_table[59]) +#define GRPC_MDSTR_IF_MODIFIED_SINCE (grpc_static_slice_table[63]) /* "if-none-match" */ -#define GRPC_MDSTR_IF_NONE_MATCH (grpc_static_slice_table[60]) +#define GRPC_MDSTR_IF_NONE_MATCH (grpc_static_slice_table[64]) /* "if-range" */ -#define GRPC_MDSTR_IF_RANGE (grpc_static_slice_table[61]) +#define GRPC_MDSTR_IF_RANGE (grpc_static_slice_table[65]) /* "if-unmodified-since" */ -#define GRPC_MDSTR_IF_UNMODIFIED_SINCE (grpc_static_slice_table[62]) +#define GRPC_MDSTR_IF_UNMODIFIED_SINCE (grpc_static_slice_table[66]) /* "last-modified" */ -#define GRPC_MDSTR_LAST_MODIFIED (grpc_static_slice_table[63]) +#define GRPC_MDSTR_LAST_MODIFIED (grpc_static_slice_table[67]) /* "lb-cost-bin" */ -#define GRPC_MDSTR_LB_COST_BIN (grpc_static_slice_table[64]) +#define GRPC_MDSTR_LB_COST_BIN (grpc_static_slice_table[68]) /* "lb-token" */ -#define GRPC_MDSTR_LB_TOKEN (grpc_static_slice_table[65]) +#define GRPC_MDSTR_LB_TOKEN (grpc_static_slice_table[69]) /* "link" */ -#define GRPC_MDSTR_LINK (grpc_static_slice_table[66]) +#define GRPC_MDSTR_LINK (grpc_static_slice_table[70]) /* "location" */ -#define GRPC_MDSTR_LOCATION (grpc_static_slice_table[67]) +#define GRPC_MDSTR_LOCATION (grpc_static_slice_table[71]) /* "max-forwards" */ -#define GRPC_MDSTR_MAX_FORWARDS (grpc_static_slice_table[68]) +#define GRPC_MDSTR_MAX_FORWARDS (grpc_static_slice_table[72]) /* ":method" */ -#define GRPC_MDSTR_METHOD (grpc_static_slice_table[69]) +#define GRPC_MDSTR_METHOD (grpc_static_slice_table[73]) /* ":path" */ -#define GRPC_MDSTR_PATH (grpc_static_slice_table[70]) +#define GRPC_MDSTR_PATH (grpc_static_slice_table[74]) /* "POST" */ -#define GRPC_MDSTR_POST (grpc_static_slice_table[71]) +#define GRPC_MDSTR_POST (grpc_static_slice_table[75]) /* "proxy-authenticate" */ -#define GRPC_MDSTR_PROXY_AUTHENTICATE (grpc_static_slice_table[72]) +#define GRPC_MDSTR_PROXY_AUTHENTICATE (grpc_static_slice_table[76]) /* "proxy-authorization" */ -#define GRPC_MDSTR_PROXY_AUTHORIZATION (grpc_static_slice_table[73]) +#define GRPC_MDSTR_PROXY_AUTHORIZATION (grpc_static_slice_table[77]) /* "PUT" */ -#define GRPC_MDSTR_PUT (grpc_static_slice_table[74]) +#define GRPC_MDSTR_PUT (grpc_static_slice_table[78]) /* "range" */ -#define GRPC_MDSTR_RANGE (grpc_static_slice_table[75]) +#define GRPC_MDSTR_RANGE (grpc_static_slice_table[79]) /* "referer" */ -#define GRPC_MDSTR_REFERER (grpc_static_slice_table[76]) +#define GRPC_MDSTR_REFERER (grpc_static_slice_table[80]) /* "refresh" */ -#define GRPC_MDSTR_REFRESH (grpc_static_slice_table[77]) +#define GRPC_MDSTR_REFRESH (grpc_static_slice_table[81]) /* "retry-after" */ -#define GRPC_MDSTR_RETRY_AFTER (grpc_static_slice_table[78]) +#define GRPC_MDSTR_RETRY_AFTER (grpc_static_slice_table[82]) /* ":scheme" */ -#define GRPC_MDSTR_SCHEME (grpc_static_slice_table[79]) +#define GRPC_MDSTR_SCHEME (grpc_static_slice_table[83]) /* "server" */ -#define GRPC_MDSTR_SERVER (grpc_static_slice_table[80]) +#define GRPC_MDSTR_SERVER (grpc_static_slice_table[84]) /* "set-cookie" */ -#define GRPC_MDSTR_SET_COOKIE (grpc_static_slice_table[81]) +#define GRPC_MDSTR_SET_COOKIE (grpc_static_slice_table[85]) /* "/" */ -#define GRPC_MDSTR_SLASH (grpc_static_slice_table[82]) +#define GRPC_MDSTR_SLASH (grpc_static_slice_table[86]) /* "/index.html" */ -#define GRPC_MDSTR_SLASH_INDEX_DOT_HTML (grpc_static_slice_table[83]) +#define GRPC_MDSTR_SLASH_INDEX_DOT_HTML (grpc_static_slice_table[87]) /* ":status" */ -#define GRPC_MDSTR_STATUS (grpc_static_slice_table[84]) +#define GRPC_MDSTR_STATUS (grpc_static_slice_table[88]) /* "strict-transport-security" */ -#define GRPC_MDSTR_STRICT_TRANSPORT_SECURITY (grpc_static_slice_table[85]) +#define GRPC_MDSTR_STRICT_TRANSPORT_SECURITY (grpc_static_slice_table[89]) /* "te" */ -#define GRPC_MDSTR_TE (grpc_static_slice_table[86]) +#define GRPC_MDSTR_TE (grpc_static_slice_table[90]) /* "trailers" */ -#define GRPC_MDSTR_TRAILERS (grpc_static_slice_table[87]) +#define GRPC_MDSTR_TRAILERS (grpc_static_slice_table[91]) /* "transfer-encoding" */ -#define GRPC_MDSTR_TRANSFER_ENCODING (grpc_static_slice_table[88]) +#define GRPC_MDSTR_TRANSFER_ENCODING (grpc_static_slice_table[92]) /* "user-agent" */ -#define GRPC_MDSTR_USER_AGENT (grpc_static_slice_table[89]) +#define GRPC_MDSTR_USER_AGENT (grpc_static_slice_table[93]) /* "vary" */ -#define GRPC_MDSTR_VARY (grpc_static_slice_table[90]) +#define GRPC_MDSTR_VARY (grpc_static_slice_table[94]) /* "via" */ -#define GRPC_MDSTR_VIA (grpc_static_slice_table[91]) +#define GRPC_MDSTR_VIA (grpc_static_slice_table[95]) /* "www-authenticate" */ -#define GRPC_MDSTR_WWW_AUTHENTICATE (grpc_static_slice_table[92]) +#define GRPC_MDSTR_WWW_AUTHENTICATE (grpc_static_slice_table[96]) bool grpc_is_static_metadata_string(grpc_slice slice); diff --git a/test/core/end2end/fuzzers/hpack.dictionary b/test/core/end2end/fuzzers/hpack.dictionary index 12db0ff0248..75634826098 100644 --- a/test/core/end2end/fuzzers/hpack.dictionary +++ b/test/core/end2end/fuzzers/hpack.dictionary @@ -40,6 +40,10 @@ "\x03GET" "\x04grpc" "\x14grpc-accept-encoding" +"\x1Egrpc.max_request_message_bytes" +"\x1Fgrpc.max_response_message_bytes" +"\x0Cgrpc.timeout" +"\x13grpc.wait_for_ready" "\x0Dgrpc-encoding" "\x1Egrpc-internal-encoding-request" "\x0Cgrpc-message" diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index f0c6ffe09c2..a9001a68971 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -43,6 +43,7 @@ import re # also be created) CONFIG = [ + # metadata strings 'grpc-timeout', 'grpc-internal-encoding-request', 'grpc-payload-bin', @@ -57,6 +58,12 @@ CONFIG = [ 'grpc-tracing-bin', 'grpc-stats-bin', '', + # channel arg keys + 'grpc.wait_for_ready', + 'grpc.timeout', + 'grpc.max_request_message_bytes', + 'grpc.max_response_message_bytes', + # metadata elements ('grpc-status', '0'), ('grpc-status', '1'), ('grpc-status', '2'),