diff options
Diffstat (limited to 'grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc')
| -rw-r--r-- | grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index bd7ff9b3..6fdf0701 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -37,9 +37,9 @@ #include <grpc/support/log.h> #include <grpc/support/sync.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 @@ -80,14 +80,15 @@ static int get_max_accept_queue_size(void) { return s_max_accept_queue_size; } -static grpc_error* add_socket_to_server(grpc_tcp_server* s, int fd, - const grpc_resolved_address* addr, - unsigned port_index, unsigned fd_index, - grpc_tcp_listener** listener) { +static grpc_error_handle add_socket_to_server(grpc_tcp_server* s, int fd, + const grpc_resolved_address* addr, + unsigned port_index, + unsigned fd_index, + grpc_tcp_listener** listener) { grpc_tcp_listener* sp = nullptr; int port = -1; - grpc_error* err = + grpc_error_handle err = grpc_tcp_server_prepare_socket(s, fd, addr, s->so_reuseport, &port); if (err == GRPC_ERROR_NONE) { GPR_ASSERT(port > 0); @@ -123,14 +124,15 @@ static grpc_error* add_socket_to_server(grpc_tcp_server* s, int fd, /* If successful, add a listener to s for addr, set *dsmode for the socket, and return the *listener. */ -grpc_error* grpc_tcp_server_add_addr(grpc_tcp_server* s, - const grpc_resolved_address* addr, - unsigned port_index, unsigned fd_index, - grpc_dualstack_mode* dsmode, - grpc_tcp_listener** listener) { +grpc_error_handle grpc_tcp_server_add_addr(grpc_tcp_server* s, + const grpc_resolved_address* addr, + unsigned port_index, + unsigned fd_index, + grpc_dualstack_mode* dsmode, + grpc_tcp_listener** listener) { grpc_resolved_address addr4_copy; int fd; - grpc_error* err = + grpc_error_handle err = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, dsmode, &fd); if (err != GRPC_ERROR_NONE) { return err; @@ -143,11 +145,11 @@ grpc_error* grpc_tcp_server_add_addr(grpc_tcp_server* s, } /* Prepare a recently-created socket for listening. */ -grpc_error* grpc_tcp_server_prepare_socket(grpc_tcp_server* s, int fd, - const grpc_resolved_address* addr, - bool so_reuseport, int* port) { +grpc_error_handle grpc_tcp_server_prepare_socket( + grpc_tcp_server* s, int fd, const grpc_resolved_address* addr, + bool so_reuseport, int* port) { grpc_resolved_address sockname_temp; - grpc_error* err = GRPC_ERROR_NONE; + grpc_error_handle err = GRPC_ERROR_NONE; GPR_ASSERT(fd >= 0); @@ -210,7 +212,7 @@ error: if (fd >= 0) { close(fd); } - grpc_error* ret = + grpc_error_handle ret = grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Unable to configure socket", &err, 1), GRPC_ERROR_INT_FD, fd); |