aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/surface
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2015-06-18 17:24:44 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2015-06-19 13:01:52 -0700
commit5927aec9b72dba7694218501e2f93d6c127776af (patch)
treee792735554d907c139ec7c6cfa073a959fd05825 /src/core/surface
parentf9b803ee2c036222f85da39aa3d8365da9c9f861 (diff)
Added generated configs
Diffstat (limited to 'src/core/surface')
-rw-r--r--src/core/surface/call.c2
-rw-r--r--src/core/surface/channel.c1
-rw-r--r--src/core/surface/secure_channel_create.c5
3 files changed, 6 insertions, 2 deletions
diff --git a/src/core/surface/call.c b/src/core/surface/call.c
index 20ce6f9bf8..41257419c0 100644
--- a/src/core/surface/call.c
+++ b/src/core/surface/call.c
@@ -1295,7 +1295,7 @@ grpc_call_error grpc_call_start_batch(grpc_call *call, const grpc_op *ops,
req = &reqs[out++];
req->op = GRPC_IOREQ_SEND_MESSAGE;
req->data.send_message = op->data.send_message;
- req->flags = ops->flags;
+ req->flags = op->flags;
break;
case GRPC_OP_SEND_CLOSE_FROM_CLIENT:
/* Flag validation: currently allow no flags */
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c
index 1fe3bf357b..6353a83b4f 100644
--- a/src/core/surface/channel.c
+++ b/src/core/surface/channel.c
@@ -265,7 +265,6 @@ grpc_mdstr *grpc_channel_get_compresssion_level_string(grpc_channel *channel) {
return channel->grpc_compression_level_string;
}
-
grpc_mdelem *grpc_channel_get_reffed_status_elem(grpc_channel *channel, int i) {
if (i >= 0 && i < NUM_CACHED_STATUS_ELEMS) {
return grpc_mdelem_ref(channel->grpc_status_elem[i]);
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c
index 8b39934881..4c94e29e30 100644
--- a/src/core/surface/secure_channel_create.c
+++ b/src/core/surface/secure_channel_create.c
@@ -42,6 +42,7 @@
#include "src/core/channel/channel_args.h"
#include "src/core/channel/client_channel.h"
#include "src/core/channel/client_setup.h"
+#include "src/core/channel/compress_filter.h"
#include "src/core/channel/connected_channel.h"
#include "src/core/channel/http_client_filter.h"
#include "src/core/iomgr/resolve_address.h"
@@ -239,6 +240,10 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds,
if (grpc_channel_args_is_census_enabled(args)) {
filters[n++] = &grpc_client_census_filter;
} */
+ if (grpc_channel_args_get_compression_level(args) >
+ GRPC_COMPRESS_LEVEL_NONE) {
+ filters[n++] = &grpc_compress_filter;
+ }
filters[n++] = &grpc_client_channel_filter;
GPR_ASSERT(n <= MAX_FILTERS);
channel = grpc_channel_create_from_filters(filters, n, args_copy, mdctx, 1);