diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-11-02 16:27:49 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-11-02 16:27:49 -0700 |
| commit | 64d518e3b030fe72a7ccb066d4c2e4b47bd79840 (patch) | |
| tree | 6e75ea76928623dd6d8108036a64c6808b05b79f /src/core/lib/iomgr/socket_utils_posix.h | |
| parent | 87772d5b881449208858bd4a75a52b5b50d30304 (diff) | |
| parent | 11948f74414e6c95b81fbcc2f0d06afa0b1cbce5 (diff) | |
Merge remote-tracking branch 'upstream/master' into tos
Diffstat (limited to 'src/core/lib/iomgr/socket_utils_posix.h')
| -rw-r--r-- | src/core/lib/iomgr/socket_utils_posix.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/socket_utils_posix.h b/src/core/lib/iomgr/socket_utils_posix.h index 0ad2d39497..e84d3781a1 100644 --- a/src/core/lib/iomgr/socket_utils_posix.h +++ b/src/core/lib/iomgr/socket_utils_posix.h @@ -34,6 +34,8 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_POSIX_H #define GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_POSIX_H +#include "src/core/lib/iomgr/resolve_address.h" + #include <sys/socket.h> #include <unistd.h> @@ -42,8 +44,8 @@ #include "src/core/lib/iomgr/socket_mutator.h" /* a wrapper for accept or accept4 */ -int grpc_accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, - int nonblock, int cloexec); +int grpc_accept4(int sockfd, grpc_resolved_address *resolved_addr, int nonblock, + int cloexec); /* set a socket to non blocking mode */ grpc_error *grpc_set_socket_nonblocking(int fd, int non_blocking); @@ -130,8 +132,8 @@ extern int grpc_forbid_dualstack_sockets_for_testing; IPv4, so that bind() or connect() see the correct family. Also, it's important to distinguish between DUALSTACK and IPV6 when listening on the [::] wildcard address. */ -grpc_error *grpc_create_dualstack_socket(const struct sockaddr *addr, int type, - int protocol, +grpc_error *grpc_create_dualstack_socket(const grpc_resolved_address *addr, + int type, int protocol, grpc_dualstack_mode *dsmode, int *newfd); |