diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-03 13:00:31 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-03 13:00:31 -0700 |
| commit | 6461c34e4e8984e3a55fdc59a50354361a95296e (patch) | |
| tree | d10f821011a0364144641504070bb8696a6c119d /src | |
| parent | 9b3648a28e636398788737ce83982a4cb061031b (diff) | |
| parent | 6b97e5344f4dddcdad1e0525b733162c0025b770 (diff) | |
Merge branch 'minimal' into minimal_test
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/surface/init.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/core/lib/surface/init.c b/src/core/lib/surface/init.c index f9b1675465..15396b1663 100644 --- a/src/core/lib/surface/init.c +++ b/src/core/lib/surface/init.c @@ -105,6 +105,22 @@ static bool maybe_add_http_filter(grpc_exec_ctx *exec_ctx, return true; } +typedef struct { + const grpc_channel_filter *filter; + const char *controlling_channel_arg; + bool default_on; +} maybe_prepend_filter_args; + +static const maybe_prepend_filter_args message_size_args = { + &grpc_message_size_filter, NULL, true}; + +static bool maybe_prepend_filter(grpc_exec_ctx *exec_ctx, + grpc_channel_stack_builder *builder, + void *arg) { + return grpc_channel_stack_builder_prepend_filter( + builder, (const grpc_channel_filter *)arg, NULL, NULL); +} + static void register_builtin_channel_init() { grpc_channel_init_register_stage( GRPC_CLIENT_DIRECT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, @@ -113,6 +129,18 @@ static void register_builtin_channel_init() { GRPC_SERVER_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, prepend_filter, (void *)&grpc_server_deadline_filter); grpc_channel_init_register_stage( +<<<<<<< HEAD +======= + GRPC_CLIENT_SUBCHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, + maybe_prepend_filter, (void *)&message_size_args); + grpc_channel_init_register_stage( + GRPC_CLIENT_DIRECT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, + prepend_filter, (void *)&grpc_message_size_filter); + grpc_channel_init_register_stage( + GRPC_SERVER_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, prepend_filter, + (void *)&grpc_message_size_filter); + grpc_channel_init_register_stage( +>>>>>>> 6b97e5344f4dddcdad1e0525b733162c0025b770 GRPC_CLIENT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, prepend_filter, (void *)&grpc_compress_filter); grpc_channel_init_register_stage( |