From 70d29b3b6ccfc8f181b26d82361a5a841f19e6c1 Mon Sep 17 00:00:00 2001 From: yijiem Date: Mon, 14 Oct 2024 11:27:37 -0700 Subject: [PATCH] review --- .../transport/chttp2/server/chttp2_server.cc | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc index d71c35f2244..52ead2c87a9 100644 --- a/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -966,7 +966,7 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr, args_modifier); } *port_num = -1; - absl::StatusOr> resolved_or; + absl::StatusOr> resolved; absl::StatusOr> results = std::vector(); std::vector error_list; @@ -977,19 +977,19 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr, grpc_error_handle error; // TODO(ladynana, yijiem): this code does not handle address URIs correctly: // it's parsing `unix://foo/bar` as path `/foo/bar` when it should be - // parsing it as authority `foo` and path `/bar`. This needs to be fixed as - // part of the address URI work. + // parsing it as authority `foo` and path `/bar`. Also add API documentation + // on the valid URIs that grpc_server_add_http2_port accepts. if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixUriPrefix)) { - resolved_or = grpc_resolve_unix_domain_address(parsed_addr_unprefixed); - GRPC_RETURN_IF_ERROR(resolved_or.status()); + resolved = grpc_resolve_unix_domain_address(parsed_addr_unprefixed); + GRPC_RETURN_IF_ERROR(resolved.status()); } else if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixAbstractUriPrefix)) { - resolved_or = + resolved = grpc_resolve_unix_abstract_domain_address(parsed_addr_unprefixed); - GRPC_RETURN_IF_ERROR(resolved_or.status()); + GRPC_RETURN_IF_ERROR(resolved.status()); } else if (absl::ConsumePrefix(&parsed_addr_unprefixed, kVSockUriPrefix)) { - resolved_or = grpc_resolve_vsock_address(parsed_addr_unprefixed); - GRPC_RETURN_IF_ERROR(resolved_or.status()); + resolved = grpc_resolve_vsock_address(parsed_addr_unprefixed); + GRPC_RETURN_IF_ERROR(resolved.status()); } else { if (IsEventEngineDnsNonClientChannelEnabled()) { absl::StatusOr> ee_resolver = @@ -1010,8 +1010,8 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr, } } } - if (resolved_or.ok()) { - for (const auto& addr : *resolved_or) { + if (resolved.ok()) { + for (const auto& addr : *resolved) { results->push_back( grpc_event_engine::experimental::CreateResolvedAddress(addr)); }