diff options
| author |  Alistair Veitch <aveitch@google.com> | 2015-07-26 15:24:41 -0700 |
|---|---|---|
| committer | Alistair Veitch <aveitch@google.com> | 2015-07-26 15:24:41 -0700 |
| commit | b4cbc1e2f72b18da3c84130c5bf7b28e344fba8f (patch) | |
| tree | 5564c6754f30570bb59c6e62c2ddda405a51296b /src/core/iomgr/tcp_server_posix.c | |
| parent | af5002f9ae647f8d82ec3b1cdaef4438cd6d2ad0 (diff) | |
| parent | 5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff) | |
post-merge
Diffstat (limited to 'src/core/iomgr/tcp_server_posix.c')
| -rw-r--r-- | src/core/iomgr/tcp_server_posix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c index 5854031c9b..8538600112 100644 --- a/src/core/iomgr/tcp_server_posix.c +++ b/src/core/iomgr/tcp_server_posix.c @@ -332,7 +332,7 @@ static void on_read(void *arg, int success) { grpc_set_socket_no_sigpipe_if_possible(fd); - grpc_sockaddr_to_string(&addr_str, (struct sockaddr *)&addr, 1); + addr_str = grpc_sockaddr_to_uri((struct sockaddr *)&addr); gpr_asprintf(&name, "tcp-server-connection:%s", addr_str); fdobj = grpc_fd_create(fd, name); @@ -342,8 +342,9 @@ static void on_read(void *arg, int success) { for (i = 0; i < sp->server->pollset_count; i++) { grpc_pollset_add_fd(sp->server->pollsets[i], fdobj); } - sp->server->cb(sp->server->cb_arg, - grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE)); + sp->server->cb( + sp->server->cb_arg, + grpc_tcp_create(fdobj, GRPC_TCP_DEFAULT_READ_SLICE_SIZE, addr_str)); gpr_free(name); gpr_free(addr_str); |