diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-11-02 12:06:57 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-11-02 12:06:57 -0700 |
| commit | 1c0b7a2d180f44012b302eb17ce103f6b4d45752 (patch) | |
| tree | 977457c5f4aac78f1e364d7e64adf5f0e2e8b869 /src/core/lib/iomgr/socket_utils_posix.h | |
| parent | 68413c221e341f4f00326e892077c5fcd4b4f788 (diff) | |
| parent | 11948f74414e6c95b81fbcc2f0d06afa0b1cbce5 (diff) | |
Merge remote-tracking branch 'upstream/master' into get_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 7bcc2219ae..175fb2b717 100644 --- a/src/core/lib/iomgr/socket_utils_posix.h +++ b/src/core/lib/iomgr/socket_utils_posix.h @@ -34,14 +34,16 @@ #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> #include "src/core/lib/iomgr/error.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); @@ -125,8 +127,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); |