grpc 1.48.0 → 1.49.1

data/src/core/ext/filters/client_channel/proxy_mapper_registry.cc

@@ -20,10 +20,13 @@
 
 #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h"
 
+#include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
 
+#include "absl/types/optional.h"
+
 namespace grpc_core {
 
 namespace {
@@ -61,30 +64,30 @@ void ProxyMapperRegistry::Register(
   }
 }
 
-bool ProxyMapperRegistry::MapName(const char* server_uri,
-                                  const grpc_channel_args* args,
-                                  char** name_to_resolve,
-                                  grpc_channel_args** new_args) {
+absl::optional<std::string> ProxyMapperRegistry::MapName(
+    absl::string_view server_uri, ChannelArgs* args) {
   Init();
+  ChannelArgs args_backup = *args;
   for (const auto& mapper : *g_proxy_mapper_list) {
-    if (mapper->MapName(server_uri, args, name_to_resolve, new_args)) {
-      return true;
-    }
+    *args = args_backup;
+    auto r = mapper->MapName(server_uri, args);
+    if (r.has_value()) return r;
   }
-  return false;
+  *args = args_backup;
+  return absl::nullopt;
 }
 
-bool ProxyMapperRegistry::MapAddress(const grpc_resolved_address& address,
-                                     const grpc_channel_args* args,
-                                     grpc_resolved_address** new_address,
-                                     grpc_channel_args** new_args) {
+absl::optional<grpc_resolved_address> ProxyMapperRegistry::MapAddress(
+    const grpc_resolved_address& address, ChannelArgs* args) {
   Init();
+  ChannelArgs args_backup = *args;
   for (const auto& mapper : *g_proxy_mapper_list) {
-    if (mapper->MapAddress(address, args, new_address, new_args)) {
-      return true;
-    }
+    *args = args_backup;
+    auto r = mapper->MapAddress(address, args);
+    if (r.has_value()) return r;
   }
-  return false;
+  *args = args_backup;
+  return absl::nullopt;
 }
 
 }  // namespace grpc_core

data/src/core/ext/filters/client_channel/proxy_mapper_registry.h

@@ -22,10 +22,13 @@
 #include <grpc/support/port_platform.h>
 
 #include <memory>
+#include <string>
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
 
 #include "src/core/ext/filters/client_channel/proxy_mapper.h"
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
 namespace grpc_core {
@@ -41,13 +44,11 @@ class ProxyMapperRegistry {
   static void Register(bool at_start,
                        std::unique_ptr<ProxyMapperInterface> mapper);
 
-  static bool MapName(const char* server_uri, const grpc_channel_args* args,
-                      char** name_to_resolve, grpc_channel_args** new_args);
+  static absl::optional<std::string> MapName(absl::string_view server_uri,
+                                             ChannelArgs* args);
 
-  static bool MapAddress(const grpc_resolved_address& address,
-                         const grpc_channel_args* args,
-                         grpc_resolved_address** new_address,
-                         grpc_channel_args** new_args);
+  static absl::optional<grpc_resolved_address> MapAddress(
+      const grpc_resolved_address& address, ChannelArgs* args);
 };
 
 }  // namespace grpc_core

data/src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc

@@ -26,7 +26,6 @@
 
 #include <memory>
 #include <string>
-#include <type_traits>
 #include <utility>
 
 #include "absl/memory/memory.h"
@@ -35,7 +34,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/channel/channel_args.h"
@@ -58,15 +56,13 @@ class BinderResolver : public Resolver {
   BinderResolver(ServerAddressList addresses, ResolverArgs args)
       : result_handler_(std::move(args.result_handler)),
         addresses_(std::move(addresses)),
-        channel_args_(grpc_channel_args_copy(args.args)) {}
-
-  ~BinderResolver() override { grpc_channel_args_destroy(channel_args_); };
+        channel_args_(std::move(args.args)) {}
 
   void StartLocked() override {
     Result result;
     result.addresses = std::move(addresses_);
     result.args = channel_args_;
-    channel_args_ = nullptr;
+    channel_args_ = ChannelArgs();
     result_handler_->ReportResult(std::move(result));
   }
 
@@ -75,7 +71,7 @@ class BinderResolver : public Resolver {
  private:
   std::unique_ptr<ResultHandler> result_handler_;
   ServerAddressList addresses_;
-  const grpc_channel_args* channel_args_ = nullptr;
+  ChannelArgs channel_args_;
 };
 
 class BinderResolverFactory : public ResolverFactory {
@@ -135,7 +131,7 @@ class BinderResolverFactory : public ResolverFactory {
       }
     }
     if (addresses != nullptr) {
-      addresses->emplace_back(addr, nullptr /* args */);
+      addresses->emplace_back(addr, ChannelArgs());
     }
     return true;
   }