diff options
Diffstat (limited to 'grpc/src/core/lib/iomgr/tcp_server_posix.cc')
| -rw-r--r-- | grpc/src/core/lib/iomgr/tcp_server_posix.cc | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/grpc/src/core/lib/iomgr/tcp_server_posix.cc b/grpc/src/core/lib/iomgr/tcp_server_posix.cc index d6e13e81..5662aec7 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_posix.cc +++ b/grpc/src/core/lib/iomgr/tcp_server_posix.cc @@ -47,22 +47,22 @@ #include <grpc/support/sync.h> #include <grpc/support/time.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/tcp_server_utils_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" -static grpc_error* tcp_server_create(grpc_closure* shutdown_complete, - const grpc_channel_args* args, - grpc_tcp_server** server) { +static grpc_error_handle tcp_server_create(grpc_closure* shutdown_complete, + const grpc_channel_args* args, + grpc_tcp_server** server) { grpc_tcp_server* s = static_cast<grpc_tcp_server*>(gpr_zalloc(sizeof(grpc_tcp_server))); s->so_reuseport = grpc_is_socket_reuse_port_supported(); @@ -129,7 +129,7 @@ static void finish_shutdown(grpc_tcp_server* s) { gpr_free(s); } -static void destroyed_port(void* server, grpc_error* /*error*/) { +static void destroyed_port(void* server, grpc_error_handle /*error*/) { grpc_tcp_server* s = static_cast<grpc_tcp_server*>(server); gpr_mu_lock(&s->mu); s->destroyed_ports++; @@ -188,7 +188,7 @@ static void tcp_server_destroy(grpc_tcp_server* s) { } /* event manager callback when reads are ready */ -static void on_read(void* arg, grpc_error* err) { +static void on_read(void* arg, grpc_error_handle err) { grpc_tcp_listener* sp = static_cast<grpc_tcp_listener*>(arg); grpc_pollset* read_notifier_pollset; if (err != GRPC_ERROR_NONE) { @@ -281,18 +281,18 @@ error: } /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */ -static grpc_error* add_wildcard_addrs_to_server(grpc_tcp_server* s, - unsigned port_index, - int requested_port, - int* out_port) { +static grpc_error_handle add_wildcard_addrs_to_server(grpc_tcp_server* s, + unsigned port_index, + int requested_port, + int* out_port) { grpc_resolved_address wild4; grpc_resolved_address wild6; unsigned fd_index = 0; grpc_dualstack_mode dsmode; grpc_tcp_listener* sp = nullptr; grpc_tcp_listener* sp2 = nullptr; - grpc_error* v6_err = GRPC_ERROR_NONE; - grpc_error* v4_err = GRPC_ERROR_NONE; + grpc_error_handle v6_err = GRPC_ERROR_NONE; + grpc_error_handle v4_err = GRPC_ERROR_NONE; *out_port = -1; if (grpc_tcp_server_have_ifaddrs() && s->expand_wildcard_addrs) { @@ -325,19 +325,19 @@ static grpc_error* add_wildcard_addrs_to_server(grpc_tcp_server* s, gpr_log(GPR_INFO, "Failed to add :: listener, " "the environment may not support IPv6: %s", - grpc_error_string(v6_err)); + grpc_error_std_string(v6_err).c_str()); GRPC_ERROR_UNREF(v6_err); } if (v4_err != GRPC_ERROR_NONE) { gpr_log(GPR_INFO, "Failed to add 0.0.0.0 listener, " "the environment may not support IPv4: %s", - grpc_error_string(v4_err)); + grpc_error_std_string(v4_err).c_str()); GRPC_ERROR_UNREF(v4_err); } return GRPC_ERROR_NONE; } else { - grpc_error* root_err = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + grpc_error_handle root_err = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to add any wildcard listeners"); GPR_ASSERT(v6_err != GRPC_ERROR_NONE && v4_err != GRPC_ERROR_NONE); root_err = grpc_error_add_child(root_err, v6_err); @@ -346,10 +346,11 @@ static grpc_error* add_wildcard_addrs_to_server(grpc_tcp_server* s, } } -static grpc_error* clone_port(grpc_tcp_listener* listener, unsigned count) { +static grpc_error_handle clone_port(grpc_tcp_listener* listener, + unsigned count) { grpc_tcp_listener* sp = nullptr; std::string addr_str; - grpc_error* err; + grpc_error_handle err; for (grpc_tcp_listener* l = listener->next; l && l->is_sibling; l = l->next) { l->fd_index += count; @@ -395,16 +396,16 @@ static grpc_error* clone_port(grpc_tcp_listener* listener, unsigned count) { return GRPC_ERROR_NONE; } -static grpc_error* tcp_server_add_port(grpc_tcp_server* s, - const grpc_resolved_address* addr, - int* out_port) { +static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s, + const grpc_resolved_address* addr, + int* out_port) { grpc_tcp_listener* sp; grpc_resolved_address sockname_temp; grpc_resolved_address addr6_v4mapped; int requested_port = grpc_sockaddr_get_port(addr); unsigned port_index = 0; grpc_dualstack_mode dsmode; - grpc_error* err; + grpc_error_handle err; *out_port = -1; if (s->tail != nullptr) { port_index = s->tail->port_index + 1; |