diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-26 12:21:28 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-01-26 12:21:28 -0800 |
| commit | afceb2edbd909757d6e6c0f3d1d25b8d50893220 (patch) | |
| tree | 8d374dc86ddafa272536ec98b71fe07f7b33213d /src/core/ext/lb_policy/grpclb | |
| parent | 8b7372b1eefbd84d6c62aae27f219e0ea8c55a87 (diff) | |
| parent | 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae (diff) | |
Merge github.com:grpc/grpc into rollfwd
Diffstat (limited to 'src/core/ext/lb_policy/grpclb')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c index ded457f64a..308facb7e7 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -1181,14 +1181,15 @@ static void query_for_backends_locked(grpc_exec_ctx *exec_ctx, op++; op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata = &glb_policy->lb_initial_metadata_recv; + op->data.recv_initial_metadata.recv_initial_metadata = + &glb_policy->lb_initial_metadata_recv; op->flags = 0; op->reserved = NULL; op++; GPR_ASSERT(glb_policy->lb_request_payload != NULL); op->op = GRPC_OP_SEND_MESSAGE; - op->data.send_message = glb_policy->lb_request_payload; + op->data.send_message.send_message = glb_policy->lb_request_payload; op->flags = 0; op->reserved = NULL; op++; @@ -1212,7 +1213,7 @@ static void query_for_backends_locked(grpc_exec_ctx *exec_ctx, op = ops; op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &glb_policy->lb_response_payload; + op->data.recv_message.recv_message = &glb_policy->lb_response_payload; op->flags = 0; op->reserved = NULL; op++; @@ -1294,7 +1295,7 @@ static void lb_on_response_received(grpc_exec_ctx *exec_ctx, void *arg, if (!glb_policy->shutting_down) { /* keep listening for serverlist updates */ op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &glb_policy->lb_response_payload; + op->data.recv_message.recv_message = &glb_policy->lb_response_payload; op->flags = 0; op->reserved = NULL; op++; |