diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-08-17 14:03:50 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-08-17 18:28:00 -0700 |
| commit | 935c171ee8446a7327763608d8688b644a2436a0 (patch) | |
| tree | f4646cbbf7258367a16c9f4b8a81314313cd0d5e /src/core/surface/channel_create.c | |
| parent | 864d18650e007d9080257d685fc09bfbbf3a306e (diff) | |
| parent | 2461bf675ec23f513569a14933609f09b4ff3854 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression-interop
Diffstat (limited to 'src/core/surface/channel_create.c')
| -rw-r--r-- | src/core/surface/channel_create.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 707d615688..82ddfac757 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -155,7 +155,8 @@ static const grpc_subchannel_factory_vtable subchannel_factory_vtable = { - connect to it (trying alternatives as presented) - perform handshakes */ grpc_channel *grpc_insecure_channel_create(const char *target, - const grpc_channel_args *args) { + const grpc_channel_args *args, + void *reserved) { grpc_channel *channel = NULL; #define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; @@ -163,6 +164,7 @@ grpc_channel *grpc_insecure_channel_create(const char *target, subchannel_factory *f; grpc_mdctx *mdctx = grpc_mdctx_create(); int n = 0; + GPR_ASSERT(!reserved); /* TODO(census) if (grpc_channel_args_is_census_enabled(args)) { filters[n++] = &grpc_client_census_filter; |