grpc 1.47.0-x86_64-linux → 1.49.0.pre1-x86_64-linux

data/src/core/ext/xds/xds_transport_grpc.cc

@@ -0,0 +1,349 @@
+//
+// Copyright 2022 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/xds/xds_transport_grpc.h"
+
+#include <string.h>
+
+#include <functional>
+#include <memory>
+#include <utility>
+
+#include <grpc/byte_buffer.h>
+#include <grpc/byte_buffer_reader.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/codegen/connectivity_state.h>
+#include <grpc/impl/codegen/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/support/log.h>
+
+#include "src/core/ext/filters/client_channel/client_channel.h"
+#include "src/core/ext/xds/xds_bootstrap.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/channel/channel_fwd.h"
+#include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/orphanable.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/time.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/pollset_set.h"
+#include "src/core/lib/security/credentials/channel_creds_registry.h"
+#include "src/core/lib/security/credentials/credentials.h"
+#include "src/core/lib/slice/slice.h"
+#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/slice/slice_refcount.h"
+#include "src/core/lib/surface/call.h"
+#include "src/core/lib/surface/channel.h"
+#include "src/core/lib/surface/lame_client.h"
+#include "src/core/lib/transport/connectivity_state.h"
+
+namespace grpc_core {
+
+//
+// GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall
+//
+
+GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::GrpcStreamingCall(
+    RefCountedPtr<GrpcXdsTransportFactory> factory, grpc_channel* channel,
+    const char* method,
+    std::unique_ptr<StreamingCall::EventHandler> event_handler)
+    : factory_(std::move(factory)), event_handler_(std::move(event_handler)) {
+  // Create call.
+  call_ = grpc_channel_create_pollset_set_call(
+      channel, nullptr, GRPC_PROPAGATE_DEFAULTS, factory_->interested_parties(),
+      StaticSlice::FromStaticString(method).c_slice(), nullptr,
+      Timestamp::InfFuture(), nullptr);
+  GPR_ASSERT(call_ != nullptr);
+  // Init data associated with the call.
+  grpc_metadata_array_init(&initial_metadata_recv_);
+  grpc_metadata_array_init(&trailing_metadata_recv_);
+  // Initialize closure to be used for sending messages.
+  GRPC_CLOSURE_INIT(&on_request_sent_, OnRequestSent, this, nullptr);
+  // Start ops on the call.
+  grpc_call_error call_error;
+  grpc_op ops[3];
+  memset(ops, 0, sizeof(ops));
+  // Send initial metadata.  No callback for this, since we don't really
+  // care when it finishes.
+  grpc_op* op = ops;
+  op->op = GRPC_OP_SEND_INITIAL_METADATA;
+  op->data.send_initial_metadata.count = 0;
+  op->flags = GRPC_INITIAL_METADATA_WAIT_FOR_READY |
+              GRPC_INITIAL_METADATA_WAIT_FOR_READY_EXPLICITLY_SET;
+  op->reserved = nullptr;
+  op++;
+  call_error = grpc_call_start_batch_and_execute(
+      call_, ops, static_cast<size_t>(op - ops), nullptr);
+  GPR_ASSERT(GRPC_CALL_OK == call_error);
+  // Start a batch with recv_initial_metadata and recv_message.
+  op = ops;
+  op->op = GRPC_OP_RECV_INITIAL_METADATA;
+  op->data.recv_initial_metadata.recv_initial_metadata =
+      &initial_metadata_recv_;
+  op->flags = 0;
+  op->reserved = nullptr;
+  op++;
+  op->op = GRPC_OP_RECV_MESSAGE;
+  op->data.recv_message.recv_message = &recv_message_payload_;
+  op->flags = 0;
+  op->reserved = nullptr;
+  op++;
+  Ref(DEBUG_LOCATION, "OnResponseReceived").release();
+  GRPC_CLOSURE_INIT(&on_response_received_, OnResponseReceived, this, nullptr);
+  call_error = grpc_call_start_batch_and_execute(
+      call_, ops, static_cast<size_t>(op - ops), &on_response_received_);
+  GPR_ASSERT(GRPC_CALL_OK == call_error);
+  // Start a batch for recv_trailing_metadata.
+  op = ops;
+  op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
+  op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv_;
+  op->data.recv_status_on_client.status = &status_code_;
+  op->data.recv_status_on_client.status_details = &status_details_;
+  op->flags = 0;
+  op->reserved = nullptr;
+  op++;
+  // This callback signals the end of the call, so it relies on the initial
+  // ref instead of a new ref. When it's invoked, it's the initial ref that is
+  // unreffed.
+  GRPC_CLOSURE_INIT(&on_status_received_, OnStatusReceived, this, nullptr);
+  call_error = grpc_call_start_batch_and_execute(
+      call_, ops, static_cast<size_t>(op - ops), &on_status_received_);
+  GPR_ASSERT(GRPC_CALL_OK == call_error);
+}
+
+GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
+    ~GrpcStreamingCall() {
+  grpc_metadata_array_destroy(&initial_metadata_recv_);
+  grpc_metadata_array_destroy(&trailing_metadata_recv_);
+  grpc_byte_buffer_destroy(send_message_payload_);
+  grpc_byte_buffer_destroy(recv_message_payload_);
+  grpc_slice_unref_internal(status_details_);
+  GPR_ASSERT(call_ != nullptr);
+  grpc_call_unref(call_);
+}
+
+void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::Orphan() {
+  GPR_ASSERT(call_ != nullptr);
+  // If we are here because xds_client wants to cancel the call,
+  // OnStatusReceived() will complete the cancellation and clean up.
+  // Otherwise, we are here because xds_client has to orphan a failed call,
+  // in which case the following cancellation will be a no-op.
+  grpc_call_cancel_internal(call_);
+  // Note that the initial ref is held by OnStatusReceived(), so the
+  // corresponding unref happens there instead of here.
+}
+
+void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::SendMessage(
+    std::string payload) {
+  // Create payload.
+  grpc_slice slice = grpc_slice_from_cpp_string(std::move(payload));
+  send_message_payload_ = grpc_raw_byte_buffer_create(&slice, 1);
+  grpc_slice_unref_internal(slice);
+  // Send the message.
+  grpc_op op;
+  memset(&op, 0, sizeof(op));
+  op.op = GRPC_OP_SEND_MESSAGE;
+  op.data.send_message.send_message = send_message_payload_;
+  Ref(DEBUG_LOCATION, "OnRequestSent").release();
+  grpc_call_error call_error =
+      grpc_call_start_batch_and_execute(call_, &op, 1, &on_request_sent_);
+  GPR_ASSERT(GRPC_CALL_OK == call_error);
+}
+
+void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
+    OnRequestSent(void* arg, grpc_error_handle error) {
+  auto* self = static_cast<GrpcStreamingCall*>(arg);
+  // Clean up the sent message.
+  grpc_byte_buffer_destroy(self->send_message_payload_);
+  self->send_message_payload_ = nullptr;
+  // Invoke request handler.
+  self->event_handler_->OnRequestSent(GRPC_ERROR_IS_NONE(error));
+  // Drop the ref.
+  self->Unref(DEBUG_LOCATION, "OnRequestSent");
+}
+
+void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
+    OnResponseReceived(void* arg, grpc_error_handle /*error*/) {
+  auto* self = static_cast<GrpcStreamingCall*>(arg);
+  // If there was no payload, then we received status before we received
+  // another message, so we stop reading.
+  if (self->recv_message_payload_ == nullptr) {
+    self->Unref(DEBUG_LOCATION, "OnResponseReceived");
+    return;
+  }
+  // Process the response.
+  grpc_byte_buffer_reader bbr;
+  grpc_byte_buffer_reader_init(&bbr, self->recv_message_payload_);
+  grpc_slice response_slice = grpc_byte_buffer_reader_readall(&bbr);
+  grpc_byte_buffer_reader_destroy(&bbr);
+  grpc_byte_buffer_destroy(self->recv_message_payload_);
+  self->recv_message_payload_ = nullptr;
+  self->event_handler_->OnRecvMessage(StringViewFromSlice(response_slice));
+  grpc_slice_unref_internal(response_slice);
+  // Keep reading.
+  grpc_op op;
+  memset(&op, 0, sizeof(op));
+  op.op = GRPC_OP_RECV_MESSAGE;
+  op.data.recv_message.recv_message = &self->recv_message_payload_;
+  GPR_ASSERT(self->call_ != nullptr);
+  // Reuses the "OnResponseReceived" ref taken in ctor.
+  const grpc_call_error call_error = grpc_call_start_batch_and_execute(
+      self->call_, &op, 1, &self->on_response_received_);
+  GPR_ASSERT(GRPC_CALL_OK == call_error);
+}
+
+void GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall::
+    OnStatusReceived(void* arg, grpc_error_handle /*error*/) {
+  auto* self = static_cast<GrpcStreamingCall*>(arg);
+  self->event_handler_->OnStatusReceived(
+      absl::Status(static_cast<absl::StatusCode>(self->status_code_),
+                   StringViewFromSlice(self->status_details_)));
+  self->Unref(DEBUG_LOCATION, "OnStatusReceived");
+}
+
+//
+// GrpcXdsTransportFactory::GrpcXdsTransport::StateWatcher
+//
+
+class GrpcXdsTransportFactory::GrpcXdsTransport::StateWatcher
+    : public AsyncConnectivityStateWatcherInterface {
+ public:
+  explicit StateWatcher(
+      std::function<void(absl::Status)> on_connectivity_failure)
+      : on_connectivity_failure_(std::move(on_connectivity_failure)) {}
+
+ private:
+  void OnConnectivityStateChange(grpc_connectivity_state new_state,
+                                 const absl::Status& status) override {
+    if (new_state == GRPC_CHANNEL_TRANSIENT_FAILURE) {
+      on_connectivity_failure_(status);
+    }
+  }
+
+  std::function<void(absl::Status)> on_connectivity_failure_;
+};
+
+//
+// GrpcXdsClient::GrpcXdsTransport
+//
+
+namespace {
+
+grpc_channel* CreateXdsChannel(const ChannelArgs& args,
+                               const XdsBootstrap::XdsServer& server) {
+  RefCountedPtr<grpc_channel_credentials> channel_creds =
+      CoreConfiguration::Get().channel_creds_registry().CreateChannelCreds(
+          server.channel_creds_type, server.channel_creds_config);
+  return grpc_channel_create(server.server_uri.c_str(), channel_creds.get(),
+                             args.ToC().get());
+}
+
+bool IsLameChannel(grpc_channel* channel) {
+  grpc_channel_element* elem =
+      grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
+  return elem->filter == &LameClientFilter::kFilter;
+}
+
+}  // namespace
+
+GrpcXdsTransportFactory::GrpcXdsTransport::GrpcXdsTransport(
+    GrpcXdsTransportFactory* factory, const XdsBootstrap::XdsServer& server,
+    std::function<void(absl::Status)> on_connectivity_failure,
+    absl::Status* status)
+    : factory_(factory) {
+  channel_ = CreateXdsChannel(factory->args_, server);
+  GPR_ASSERT(channel_ != nullptr);
+  if (IsLameChannel(channel_)) {
+    *status = absl::UnavailableError("xds client has a lame channel");
+  } else {
+    ClientChannel* client_channel =
+        ClientChannel::GetFromChannel(Channel::FromC(channel_));
+    GPR_ASSERT(client_channel != nullptr);
+    watcher_ = new StateWatcher(std::move(on_connectivity_failure));
+    client_channel->AddConnectivityWatcher(
+        GRPC_CHANNEL_IDLE,
+        OrphanablePtr<AsyncConnectivityStateWatcherInterface>(watcher_));
+  }
+}
+
+GrpcXdsTransportFactory::GrpcXdsTransport::~GrpcXdsTransport() {
+  grpc_channel_destroy(channel_);
+}
+
+void GrpcXdsTransportFactory::GrpcXdsTransport::Orphan() {
+  if (!IsLameChannel(channel_)) {
+    ClientChannel* client_channel =
+        ClientChannel::GetFromChannel(Channel::FromC(channel_));
+    GPR_ASSERT(client_channel != nullptr);
+    client_channel->RemoveConnectivityWatcher(watcher_);
+  }
+  Unref();
+}
+
+OrphanablePtr<XdsTransportFactory::XdsTransport::StreamingCall>
+GrpcXdsTransportFactory::GrpcXdsTransport::CreateStreamingCall(
+    const char* method,
+    std::unique_ptr<StreamingCall::EventHandler> event_handler) {
+  return MakeOrphanable<GrpcStreamingCall>(
+      factory_->Ref(DEBUG_LOCATION, "StreamingCall"), channel_, method,
+      std::move(event_handler));
+}
+
+void GrpcXdsTransportFactory::GrpcXdsTransport::ResetBackoff() {
+  grpc_channel_reset_connect_backoff(channel_);
+}
+
+//
+// GrpcXdsTransportFactory
+//
+
+namespace {
+
+ChannelArgs ModifyChannelArgs(const ChannelArgs& args) {
+  return args.Set(GRPC_ARG_KEEPALIVE_TIME_MS, Duration::Minutes(5).millis());
+}
+
+}  // namespace
+
+GrpcXdsTransportFactory::GrpcXdsTransportFactory(const ChannelArgs& args)
+    : args_(ModifyChannelArgs(args)),
+      interested_parties_(grpc_pollset_set_create()) {
+  // Calling grpc_init to ensure gRPC does not shut down until the XdsClient is
+  // destroyed.
+  grpc_init();
+}
+
+GrpcXdsTransportFactory::~GrpcXdsTransportFactory() {
+  grpc_pollset_set_destroy(interested_parties_);
+  // Calling grpc_shutdown to ensure gRPC does not shut down until the XdsClient
+  // is destroyed.
+  grpc_shutdown();
+}
+
+OrphanablePtr<XdsTransportFactory::XdsTransport>
+GrpcXdsTransportFactory::Create(
+    const XdsBootstrap::XdsServer& server,
+    std::function<void(absl::Status)> on_connectivity_failure,
+    absl::Status* status) {
+  return MakeOrphanable<GrpcXdsTransport>(
+      this, server, std::move(on_connectivity_failure), status);
+}
+
+}  // namespace grpc_core

data/src/core/ext/xds/xds_transport_grpc.h

@@ -0,0 +1,135 @@
+//
+// Copyright 2022 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef GRPC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
+#define GRPC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H
+
+#include <grpc/support/port_platform.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+
+#include "absl/status/status.h"
+
+#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+
+#include "src/core/ext/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_transport.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/gprpp/orphanable.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/iomgr/iomgr_fwd.h"
+
+namespace grpc_core {
+
+class GrpcXdsTransportFactory : public XdsTransportFactory {
+ public:
+  class GrpcXdsTransport;
+
+  explicit GrpcXdsTransportFactory(const ChannelArgs& args);
+  ~GrpcXdsTransportFactory() override;
+
+  void Orphan() override { Unref(); }
+
+  OrphanablePtr<XdsTransport> Create(
+      const XdsBootstrap::XdsServer& server,
+      std::function<void(absl::Status)> on_connectivity_failure,
+      absl::Status* status) override;
+
+  grpc_pollset_set* interested_parties() const { return interested_parties_; }
+
+ private:
+  ChannelArgs args_;
+  grpc_pollset_set* interested_parties_;
+};
+
+class GrpcXdsTransportFactory::GrpcXdsTransport
+    : public XdsTransportFactory::XdsTransport {
+ public:
+  class GrpcStreamingCall;
+
+  GrpcXdsTransport(GrpcXdsTransportFactory* factory,
+                   const XdsBootstrap::XdsServer& server,
+                   std::function<void(absl::Status)> on_connectivity_failure,
+                   absl::Status* status);
+  ~GrpcXdsTransport() override;
+
+  void Orphan() override;
+
+  OrphanablePtr<StreamingCall> CreateStreamingCall(
+      const char* method,
+      std::unique_ptr<StreamingCall::EventHandler> event_handler) override;
+
+  void ResetBackoff() override;
+
+ private:
+  class StateWatcher;
+
+  GrpcXdsTransportFactory* factory_;  // Not owned.
+  grpc_channel* channel_;
+  StateWatcher* watcher_;
+};
+
+class GrpcXdsTransportFactory::GrpcXdsTransport::GrpcStreamingCall
+    : public XdsTransportFactory::XdsTransport::StreamingCall {
+ public:
+  GrpcStreamingCall(RefCountedPtr<GrpcXdsTransportFactory> factory,
+                    grpc_channel* channel, const char* method,
+                    std::unique_ptr<StreamingCall::EventHandler> event_handler);
+  ~GrpcStreamingCall() override;
+
+  void Orphan() override;
+
+  void SendMessage(std::string payload) override;
+
+ private:
+  static void OnRequestSent(void* arg, grpc_error_handle error);
+  static void OnResponseReceived(void* arg, grpc_error_handle /*error*/);
+  static void OnStatusReceived(void* arg, grpc_error_handle /*error*/);
+
+  RefCountedPtr<GrpcXdsTransportFactory> factory_;
+
+  std::unique_ptr<StreamingCall::EventHandler> event_handler_;
+
+  // Always non-NULL.
+  grpc_call* call_;
+
+  // recv_initial_metadata
+  grpc_metadata_array initial_metadata_recv_;
+
+  // send_message
+  grpc_byte_buffer* send_message_payload_ = nullptr;
+  grpc_closure on_request_sent_;
+
+  // recv_message
+  grpc_byte_buffer* recv_message_payload_ = nullptr;
+  grpc_closure on_response_received_;
+
+  // recv_trailing_metadata
+  grpc_metadata_array trailing_metadata_recv_;
+  grpc_status_code status_code_;
+  grpc_slice status_details_;
+  grpc_closure on_status_received_;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_CORE_EXT_XDS_XDS_TRANSPORT_GRPC_H

data/src/core/lib/address_utils/parse_address.cc

@@ -21,26 +21,23 @@
 #include "src/core/lib/address_utils/parse_address.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #ifdef GRPC_HAVE_UNIX_SOCKET
 #include <sys/un.h>
 #endif
-#ifdef GRPC_POSIX_SOCKET
-#include <errno.h>
-#include <net/if.h>
-#endif
+#include <string>
 
+#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
 
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
-#include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/iomgr/grpc_if_nametoindex.h"
+#include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
 
@@ -55,7 +52,7 @@ bool grpc_parse_unix(const grpc_core::URI& uri,
   }
   grpc_error_handle error =
       grpc_core::UnixSockaddrPopulate(uri.path(), resolved_addr);
-  if (error != GRPC_ERROR_NONE) {
+  if (!GRPC_ERROR_IS_NONE(error)) {
     gpr_log(GPR_ERROR, "%s", grpc_error_std_string(error).c_str());
     GRPC_ERROR_UNREF(error);
     return false;
@@ -72,7 +69,7 @@ bool grpc_parse_unix_abstract(const grpc_core::URI& uri,
   }
   grpc_error_handle error =
       grpc_core::UnixAbstractSockaddrPopulate(uri.path(), resolved_addr);
-  if (error != GRPC_ERROR_NONE) {
+  if (!GRPC_ERROR_IS_NONE(error)) {
     gpr_log(GPR_ERROR, "%s", grpc_error_std_string(error).c_str());
     GRPC_ERROR_UNREF(error);
     return false;
@@ -320,21 +317,23 @@ uint16_t grpc_strhtons(const char* port) {
   return htons(static_cast<unsigned short>(atoi(port)));
 }
 
-grpc_error_handle grpc_string_to_sockaddr(grpc_resolved_address* out,
-                                          const char* addr, int port) {
-  memset(out, 0, sizeof(grpc_resolved_address));
-  grpc_sockaddr_in6* addr6 = reinterpret_cast<grpc_sockaddr_in6*>(out->addr);
-  grpc_sockaddr_in* addr4 = reinterpret_cast<grpc_sockaddr_in*>(out->addr);
-  if (grpc_inet_pton(GRPC_AF_INET6, addr, &addr6->sin6_addr) == 1) {
-    addr6->sin6_family = GRPC_AF_INET6;
-    out->len = sizeof(grpc_sockaddr_in6);
-  } else if (grpc_inet_pton(GRPC_AF_INET, addr, &addr4->sin_addr) == 1) {
-    addr4->sin_family = GRPC_AF_INET;
-    out->len = sizeof(grpc_sockaddr_in);
-  } else {
-    return GRPC_ERROR_CREATE_FROM_CPP_STRING(
-        absl::StrCat("Failed to parse address:", addr));
+namespace grpc_core {
+
+absl::StatusOr<grpc_resolved_address> StringToSockaddr(
+    absl::string_view address_and_port) {
+  grpc_resolved_address out;
+  memset(&out, 0, sizeof(grpc_resolved_address));
+  if (!grpc_parse_ipv4_hostport(address_and_port, &out, /*log_errors=*/false) &&
+      !grpc_parse_ipv6_hostport(address_and_port, &out, /*log_errors=*/false)) {
+    return absl::InvalidArgumentError(
+        absl::StrCat("Failed to parse address:", address_and_port));
   }
-  grpc_sockaddr_set_port(out, port);
-  return GRPC_ERROR_NONE;
+  return out;
 }
+
+absl::StatusOr<grpc_resolved_address> StringToSockaddr(
+    absl::string_view address, int port) {
+  return StringToSockaddr(JoinHostPort(address, port));
+}
+
+}  // namespace grpc_core

data/src/core/lib/address_utils/parse_address.h

@@ -21,11 +21,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stddef.h>
+#include <stdint.h>
 
+#include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include "src/core/lib/iomgr/resolve_address.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/uri/uri_parser.h"
 
 /** Populate \a resolved_addr from \a uri, whose path is expected to contain a
@@ -61,13 +63,15 @@ bool grpc_parse_ipv6_hostport(absl::string_view hostport,
 /* Converts named or numeric port to a uint16 suitable for use in a sockaddr. */
 uint16_t grpc_strhtons(const char* port);
 
-// Newer form of grpc_string_to_sockaddr which returns an error instead of
-// crashing if \a addr is not IPv6/IPv6
-grpc_error_handle grpc_string_to_sockaddr(grpc_resolved_address* out,
-                                          const char* addr, int port);
-
 namespace grpc_core {
 
+// Parses an IPv4 or IPv6 address string and returns a sockaddr with the
+// specified address and port.
+absl::StatusOr<grpc_resolved_address> StringToSockaddr(
+    absl::string_view address_and_port);
+absl::StatusOr<grpc_resolved_address> StringToSockaddr(
+    absl::string_view address, int port);
+
 /** Populate \a resolved_addr to be a unix socket at |path| */
 grpc_error_handle UnixSockaddrPopulate(absl::string_view path,
                                        grpc_resolved_address* resolved_addr);

data/src/core/lib/address_utils/sockaddr_utils.cc

@@ -25,17 +25,16 @@
 #include <string.h>
 
 #include <string>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-#include "absl/strings/str_replace.h"
 
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/host_port.h"
+#include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
 #include "src/core/lib/uri/uri_parser.h"
@@ -244,7 +243,7 @@ absl::StatusOr<std::string> grpc_sockaddr_to_string(
     if (sin6_scope_id != 0) {
       // Enclose sin6_scope_id with the format defined in RFC 6874 section 2.
       std::string host_with_scope =
-          absl::StrFormat("%s%%25%" PRIu32, ntop_buf, sin6_scope_id);
+          absl::StrFormat("%s%%%" PRIu32, ntop_buf, sin6_scope_id);
       out = grpc_core::JoinHostPort(host_with_scope, port);
     } else {
       out = grpc_core::JoinHostPort(ntop_buf, port);
@@ -271,11 +270,13 @@ absl::StatusOr<std::string> grpc_sockaddr_to_uri(
   if (scheme == nullptr || strcmp("unix", scheme) == 0) {
     return grpc_sockaddr_to_uri_unix_if_possible(resolved_addr);
   }
-  // TODO(anramach): Encode the string using URI::Create() and URI::ToString()
-  // before returning.
   auto path = grpc_sockaddr_to_string(resolved_addr, false /* normalize */);
   if (!path.ok()) return path;
-  return absl::StrCat(scheme, ":", path.value());
+  absl::StatusOr<grpc_core::URI> uri =
+      grpc_core::URI::Create(scheme, /*authority=*/"", std::move(path.value()),
+                             /*query_parameter_pairs=*/{}, /*fragment=*/"");
+  if (!uri.ok()) return uri.status();
+  return uri->ToString();
 }
 
 const char* grpc_sockaddr_get_uri_scheme(

data/src/core/lib/address_utils/sockaddr_utils.h

@@ -21,6 +21,8 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stdint.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"