diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-10-26 20:52:03 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-10-26 20:52:03 -0700 |
| commit | 3d357d901c5228cf8989aed8949b20d32baad77b (patch) | |
| tree | 8bc31b6152788589447846badb6ac1a220fc8681 /src/core/lib/http | |
| parent | 6b5d682c981f365d1f3c1bf771f113bd727d5ee0 (diff) | |
| parent | d92b795b53842b747a00a82d5aae0913d041766e (diff) | |
Merge github.com:grpc/grpc into buffer_pools_for_realsies
Diffstat (limited to 'src/core/lib/http')
| -rw-r--r-- | src/core/lib/http/httpcli.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/lib/http/httpcli.c b/src/core/lib/http/httpcli.c index 26baae1eab..411e669b53 100644 --- a/src/core/lib/http/httpcli.c +++ b/src/core/lib/http/httpcli.c @@ -32,7 +32,6 @@ */ #include "src/core/lib/http/httpcli.h" -#include "src/core/lib/iomgr/sockaddr.h" #include <string.h> @@ -128,7 +127,7 @@ static void append_error(internal_request *req, grpc_error *error) { req->overall_error = GRPC_ERROR_CREATE("Failed HTTP/1 client request"); } grpc_resolved_address *addr = &req->addresses->addrs[req->next_address - 1]; - char *addr_text = grpc_sockaddr_to_uri((struct sockaddr *)addr->addr); + char *addr_text = grpc_sockaddr_to_uri(addr); req->overall_error = grpc_error_add_child( req->overall_error, grpc_error_set_str(error, GRPC_ERROR_STR_TARGET_ADDRESS, addr_text)); @@ -232,9 +231,9 @@ static void next_address(grpc_exec_ctx *exec_ctx, internal_request *req, arg.value.pointer.p = req->resource_quota; arg.value.pointer.vtable = grpc_resource_quota_arg_vtable(); grpc_channel_args args = {1, &arg}; - grpc_tcp_client_connect( - exec_ctx, &req->connected, &req->ep, req->context->pollset_set, &args, - (struct sockaddr *)&addr->addr, addr->len, req->deadline); + grpc_tcp_client_connect(exec_ctx, &req->connected, &req->ep, + req->context->pollset_set, &args, addr, + req->deadline); } static void on_resolved(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { |