From f74b4126ada0a4cda232d49c6f39a14d0dd77a36 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Mon, 3 Feb 2020 08:02:19 -0800
Subject: [PATCH] Use the empty string instead of "*" for wildcard method.
---
src/core/ext/filters/client_channel/service_config.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/core/ext/filters/client_channel/service_config.cc b/src/core/ext/filters/client_channel/service_config.cc
index 69e9d0a1870..c0160a516c7 100644
--- a/src/core/ext/filters/client_channel/service_config.cc
+++ b/src/core/ext/filters/client_channel/service_config.cc
@@ -282,7 +282,7 @@ grpc_core::UniquePtr<char> ServiceConfig::ParseJsonMethodName(
}
char* path;
gpr_asprintf(&path, "/%s/%s", service_name,
- method_name == nullptr ? "*" : method_name);
+ method_name == nullptr ? "" : method_name);
return grpc_core::UniquePtr<char>(path);
}
@@ -293,15 +293,14 @@ ServiceConfig::GetMethodParsedConfigVector(const grpc_slice& path) {
}
const auto* value = parsed_method_configs_table_->Get(path);
// If we didn't find a match for the path, try looking for a wildcard
- // entry (i.e., change "/service/method" to "/service/*").
+ // entry (i.e., change "/service/method" to "/service/").
if (value == nullptr) {
char* path_str = grpc_slice_to_c_string(path);
const char* sep = strrchr(path_str, '/') + 1;
const size_t len = (size_t)(sep - path_str);
- char* buf = (char*)gpr_malloc(len + 2); // '*' and NUL
+ char* buf = (char*)gpr_malloc(len + 1); // trailing NUL
memcpy(buf, path_str, len);
- buf[len] = '*';
- buf[len + 1] = '\0';
+ buf[len] = '\0';
grpc_slice wildcard_path = grpc_slice_from_copied_string(buf);
gpr_free(buf);
value = parsed_method_configs_table_->Get(wildcard_path);