diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-01-04 23:50:42 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2017-01-04 23:50:42 +0100 |
| commit | 0fc9999fba0b7869206026e7e592b7b7199d997b (patch) | |
| tree | 488f7ee49d7a6804eff06650c058ff114ff781eb /src | |
| parent | c8b0fba95350235c51fb7cf3fe0f0889fb89f2c4 (diff) | |
Putting message size filter back.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/channel/message_size_filter.c (renamed from src/core/ext/client_channel/message_size_filter.c) | 2 | ||||
| -rw-r--r-- | src/core/lib/channel/message_size_filter.h (renamed from src/core/ext/client_channel/message_size_filter.h) | 6 | ||||
| -rw-r--r-- | src/core/lib/surface/init.c | 10 | ||||
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 1 |
4 files changed, 15 insertions, 4 deletions
diff --git a/src/core/ext/client_channel/message_size_filter.c b/src/core/lib/channel/message_size_filter.c index c6d94cb6d0..b5e882de52 100644 --- a/src/core/ext/client_channel/message_size_filter.c +++ b/src/core/lib/channel/message_size_filter.c @@ -29,7 +29,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#include "src/core/ext/client_channel/message_size_filter.h" +#include "src/core/lib/channel/message_size_filter.h" #include <limits.h> #include <string.h> diff --git a/src/core/ext/client_channel/message_size_filter.h b/src/core/lib/channel/message_size_filter.h index 8ee4f4cca4..a88ff7f81a 100644 --- a/src/core/ext/client_channel/message_size_filter.h +++ b/src/core/lib/channel/message_size_filter.h @@ -29,11 +29,11 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // -#ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_MESSAGE_SIZE_FILTER_H -#define GRPC_CORE_EXT_CLIENT_CHANNEL_MESSAGE_SIZE_FILTER_H +#ifndef GRPC_CORE_LIB_CHANNEL_MESSAGE_SIZE_FILTER_H +#define GRPC_CORE_LIB_CHANNEL_MESSAGE_SIZE_FILTER_H #include "src/core/lib/channel/channel_stack.h" extern const grpc_channel_filter grpc_message_size_filter; -#endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_MESSAGE_SIZE_FILTER_H */ +#endif /* GRPC_CORE_LIB_CHANNEL_MESSAGE_SIZE_FILTER_H */ diff --git a/src/core/lib/surface/init.c b/src/core/lib/surface/init.c index 64aa0e3361..7903f57a68 100644 --- a/src/core/lib/surface/init.c +++ b/src/core/lib/surface/init.c @@ -46,6 +46,7 @@ #include "src/core/lib/channel/deadline_filter.h" #include "src/core/lib/channel/http_client_filter.h" #include "src/core/lib/channel/http_server_filter.h" +#include "src/core/lib/channel/message_size_filter.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/http/parser.h" #include "src/core/lib/iomgr/combiner.h" @@ -107,6 +108,15 @@ 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( + GRPC_CLIENT_SUBCHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, + prepend_filter, (void *)&grpc_message_size_filter); + 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( GRPC_CLIENT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, prepend_filter, (void *)&grpc_compress_filter); grpc_channel_init_register_stage( diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 804c30f798..179df7bb14 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -84,6 +84,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/channel/handshaker.c', 'src/core/lib/channel/http_client_filter.c', 'src/core/lib/channel/http_server_filter.c', + 'src/core/lib/channel/message_size_filter.c', 'src/core/lib/compression/compression.c', 'src/core/lib/compression/message_compress.c', 'src/core/lib/debug/trace.c', |