aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD6
-rw-r--r--CMakeLists.txt4
-rw-r--r--Makefile4
-rw-r--r--build.yaml4
-rw-r--r--config.m42
-rw-r--r--config.w322
-rw-r--r--gRPC-C++.podspec2
-rw-r--r--gRPC-Core.podspec6
-rw-r--r--grpc.gemspec4
-rw-r--r--grpc.gyp4
-rw-r--r--package.xml4
-rw-r--r--src/core/ext/filters/http/client_authority_filter.cc (renamed from src/core/lib/channel/client_authority_filter.cc)2
-rw-r--r--src/core/ext/filters/http/client_authority_filter.h (renamed from src/core/lib/channel/client_authority_filter.h)6
-rw-r--r--src/core/lib/surface/init.cc1
-rw-r--r--src/python/grpcio/grpc_core_dependencies.py2
-rw-r--r--tools/doxygen/Doxyfile.core.internal4
-rw-r--r--tools/run_tests/generated/sources_and_headers.json6
17 files changed, 30 insertions, 33 deletions
diff --git a/BUILD b/BUILD
index 75aebb2462..8a4349eb81 100644
--- a/BUILD
+++ b/BUILD
@@ -676,7 +676,6 @@ grpc_cc_library(
"src/core/lib/channel/channel_args.cc",
"src/core/lib/channel/channel_stack.cc",
"src/core/lib/channel/channel_stack_builder.cc",
- "src/core/lib/channel/client_authority_filter.cc",
"src/core/lib/channel/connected_channel.cc",
"src/core/lib/channel/handshaker.cc",
"src/core/lib/channel/handshaker_factory.cc",
@@ -812,7 +811,6 @@ grpc_cc_library(
"src/core/lib/channel/channel_args.h",
"src/core/lib/channel/channel_stack.h",
"src/core/lib/channel/channel_stack_builder.h",
- "src/core/lib/channel/client_authority_filter.h",
"src/core/lib/channel/connected_channel.h",
"src/core/lib/channel/context.h",
"src/core/lib/channel/handshaker.h",
@@ -1077,10 +1075,10 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_client_authority_filter",
srcs = [
- "src/core/lib/channel/client_authority_filter.cc",
+ "src/core/ext/filters/http/client_authority_filter.cc",
],
hdrs = [
- "src/core/lib/channel/client_authority_filter.h",
+ "src/core/ext/filters/http/client_authority_filter.h",
],
language = "c++",
deps = [
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1657f1ae7e..836b36a7eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1132,7 +1132,7 @@ add_library(grpc
src/core/ext/census/grpc_context.cc
src/core/ext/filters/max_age/max_age_filter.cc
src/core/ext/filters/message_size/message_size_filter.cc
- src/core/lib/channel/client_authority_filter.cc
+ src/core/ext/filters/http/client_authority_filter.cc
src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc
src/core/ext/filters/workarounds/workaround_utils.cc
src/core/plugin_registry/grpc_plugin_registry.cc
@@ -2367,7 +2367,7 @@ add_library(grpc_unsecure
src/core/ext/census/grpc_context.cc
src/core/ext/filters/max_age/max_age_filter.cc
src/core/ext/filters/message_size/message_size_filter.cc
- src/core/lib/channel/client_authority_filter.cc
+ src/core/ext/filters/http/client_authority_filter.cc
src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc
src/core/ext/filters/workarounds/workaround_utils.cc
src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
diff --git a/Makefile b/Makefile
index 93b3588de2..df30405d8b 100644
--- a/Makefile
+++ b/Makefile
@@ -3437,7 +3437,7 @@ LIBGRPC_SRC = \
src/core/ext/census/grpc_context.cc \
src/core/ext/filters/max_age/max_age_filter.cc \
src/core/ext/filters/message_size/message_size_filter.cc \
- src/core/lib/channel/client_authority_filter.cc \
+ src/core/ext/filters/http/client_authority_filter.cc \
src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
src/core/ext/filters/workarounds/workaround_utils.cc \
src/core/plugin_registry/grpc_plugin_registry.cc \
@@ -4648,7 +4648,7 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/census/grpc_context.cc \
src/core/ext/filters/max_age/max_age_filter.cc \
src/core/ext/filters/message_size/message_size_filter.cc \
- src/core/lib/channel/client_authority_filter.cc \
+ src/core/ext/filters/http/client_authority_filter.cc \
src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
src/core/ext/filters/workarounds/workaround_utils.cc \
src/core/plugin_registry/grpc_unsecure_plugin_registry.cc \
diff --git a/build.yaml b/build.yaml
index 20581ae00e..7a2d5cf884 100644
--- a/build.yaml
+++ b/build.yaml
@@ -517,9 +517,9 @@ filegroups:
- grpc_trace_headers
- name: grpc_client_authority_filter
headers:
- - src/core/lib/channel/client_authority_filter.h
+ - src/core/ext/filters/http/client_authority_filter.h
src:
- - src/core/lib/channel/client_authority_filter.cc
+ - src/core/ext/filters/http/client_authority_filter.cc
plugin: grpc_client_authority_filter
uses:
- grpc_base
diff --git a/config.m4 b/config.m4
index 9b48890d4c..756108ba3a 100644
--- a/config.m4
+++ b/config.m4
@@ -361,7 +361,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/census/grpc_context.cc \
src/core/ext/filters/max_age/max_age_filter.cc \
src/core/ext/filters/message_size/message_size_filter.cc \
- src/core/lib/channel/client_authority_filter.cc \
+ src/core/ext/filters/http/client_authority_filter.cc \
src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
src/core/ext/filters/workarounds/workaround_utils.cc \
src/core/plugin_registry/grpc_plugin_registry.cc \
diff --git a/config.w32 b/config.w32
index b6b417e3de..755dd08007 100644
--- a/config.w32
+++ b/config.w32
@@ -338,7 +338,7 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\census\\grpc_context.cc " +
"src\\core\\ext\\filters\\max_age\\max_age_filter.cc " +
"src\\core\\ext\\filters\\message_size\\message_size_filter.cc " +
- "src\\core\\lib\\channel\\client_authority_filter.cc " +
+ "src\\core\\ext\\filters\\http\\client_authority_filter.cc " +
"src\\core\\ext\\filters\\workarounds\\workaround_cronet_compression_filter.cc " +
"src\\core\\ext\\filters\\workarounds\\workaround_utils.cc " +
"src\\core\\plugin_registry\\grpc_plugin_registry.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 5e8ae3f9a6..ae68984e65 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -479,7 +479,7 @@ Pod::Spec.new do |s|
'src/core/ext/filters/load_reporting/server_load_reporting_plugin.h',
'src/core/ext/filters/max_age/max_age_filter.h',
'src/core/ext/filters/message_size/message_size_filter.h',
- 'src/core/lib/channel/client_authority_filter.h',
+ 'src/core/ext/filters/http/client_authority_filter.h',
'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h',
'src/core/ext/filters/workarounds/workaround_utils.h'
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 242bc49bd3..e469a99b67 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -490,7 +490,7 @@ Pod::Spec.new do |s|
'src/core/ext/filters/load_reporting/server_load_reporting_plugin.h',
'src/core/ext/filters/max_age/max_age_filter.h',
'src/core/ext/filters/message_size/message_size_filter.h',
- 'src/core/lib/channel/client_authority_filter.h',
+ 'src/core/ext/filters/http/client_authority_filter.h',
'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h',
'src/core/ext/filters/workarounds/workaround_utils.h',
'src/core/lib/surface/init.cc',
@@ -773,7 +773,7 @@ Pod::Spec.new do |s|
'src/core/ext/census/grpc_context.cc',
'src/core/ext/filters/max_age/max_age_filter.cc',
'src/core/ext/filters/message_size/message_size_filter.cc',
- 'src/core/lib/channel/client_authority_filter.cc',
+ 'src/core/ext/filters/http/client_authority_filter.cc',
'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
'src/core/ext/filters/workarounds/workaround_utils.cc',
'src/core/plugin_registry/grpc_plugin_registry.cc'
@@ -1046,7 +1046,7 @@ Pod::Spec.new do |s|
'src/core/ext/filters/load_reporting/server_load_reporting_plugin.h',
'src/core/ext/filters/max_age/max_age_filter.h',
'src/core/ext/filters/message_size/message_size_filter.h',
- 'src/core/lib/channel/client_authority_filter.h',
+ 'src/core/ext/filters/http/client_authority_filter.h',
'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h',
'src/core/ext/filters/workarounds/workaround_utils.h'
end
diff --git a/grpc.gemspec b/grpc.gemspec
index 33ca745e69..c797b28d54 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -420,7 +420,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/filters/load_reporting/server_load_reporting_plugin.h )
s.files += %w( src/core/ext/filters/max_age/max_age_filter.h )
s.files += %w( src/core/ext/filters/message_size/message_size_filter.h )
- s.files += %w( src/core/lib/channel/client_authority_filter.h )
+ s.files += %w( src/core/ext/filters/http/client_authority_filter.h )
s.files += %w( src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h )
s.files += %w( src/core/ext/filters/workarounds/workaround_utils.h )
s.files += %w( src/core/lib/surface/init.cc )
@@ -706,7 +706,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/census/grpc_context.cc )
s.files += %w( src/core/ext/filters/max_age/max_age_filter.cc )
s.files += %w( src/core/ext/filters/message_size/message_size_filter.cc )
- s.files += %w( src/core/lib/channel/client_authority_filter.cc )
+ s.files += %w( src/core/ext/filters/http/client_authority_filter.cc )
s.files += %w( src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc )
s.files += %w( src/core/ext/filters/workarounds/workaround_utils.cc )
s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc )
diff --git a/grpc.gyp b/grpc.gyp
index 04421bad57..9448183e69 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -513,7 +513,7 @@
'src/core/ext/census/grpc_context.cc',
'src/core/ext/filters/max_age/max_age_filter.cc',
'src/core/ext/filters/message_size/message_size_filter.cc',
- 'src/core/lib/channel/client_authority_filter.cc',
+ 'src/core/ext/filters/http/client_authority_filter.cc',
'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
'src/core/ext/filters/workarounds/workaround_utils.cc',
'src/core/plugin_registry/grpc_plugin_registry.cc',
@@ -1194,7 +1194,7 @@
'src/core/ext/census/grpc_context.cc',
'src/core/ext/filters/max_age/max_age_filter.cc',
'src/core/ext/filters/message_size/message_size_filter.cc',
- 'src/core/lib/channel/client_authority_filter.cc',
+ 'src/core/ext/filters/http/client_authority_filter.cc',
'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
'src/core/ext/filters/workarounds/workaround_utils.cc',
'src/core/plugin_registry/grpc_unsecure_plugin_registry.cc',
diff --git a/package.xml b/package.xml
index a8a3c4f356..79eeffbb0c 100644
--- a/package.xml
+++ b/package.xml
@@ -427,7 +427,7 @@
<file baseinstalldir="/" name="src/core/ext/filters/load_reporting/server_load_reporting_plugin.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/max_age/max_age_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/message_size/message_size_filter.h" role="src" />
- <file baseinstalldir="/" name="src/core/lib/channel/client_authority_filter.h" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/filters/http/client_authority_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_utils.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/surface/init.cc" role="src" />
@@ -713,7 +713,7 @@
<file baseinstalldir="/" name="src/core/ext/census/grpc_context.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/max_age/max_age_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/message_size/message_size_filter.cc" role="src" />
- <file baseinstalldir="/" name="src/core/lib/channel/client_authority_filter.cc" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/filters/http/client_authority_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_utils.cc" role="src" />
<file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.cc" role="src" />
diff --git a/src/core/lib/channel/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc
index bf37f52e9c..5294cfdcc5 100644
--- a/src/core/lib/channel/client_authority_filter.cc
+++ b/src/core/ext/filters/http/client_authority_filter.cc
@@ -26,8 +26,8 @@
#include <grpc/support/log.h>
#include <grpc/support/string_util.h>
+#include "src/core/ext/filters/http/client_authority_filter.h"
#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/client_authority_filter.h"
#include "src/core/lib/gpr/string.h"
#include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/slice/slice_string_helpers.h"
diff --git a/src/core/lib/channel/client_authority_filter.h b/src/core/ext/filters/http/client_authority_filter.h
index c101c359d2..5824e91ff2 100644
--- a/src/core/lib/channel/client_authority_filter.h
+++ b/src/core/ext/filters/http/client_authority_filter.h
@@ -16,8 +16,8 @@
*
*/
-#ifndef GRPC_CORE_LIB_CHANNEL_CLIENT_AUTHORITY_FILTER_H
-#define GRPC_CORE_LIB_CHANNEL_CLIENT_AUTHORITY_FILTER_H
+#ifndef GRPC_CORE_EXT_FILTERS_HTTP_CLIENT_AUTHORITY_FILTER_H
+#define GRPC_CORE_EXT_FILTERS_HTTP_CLIENT_AUTHORITY_FILTER_H
#include <grpc/support/port_platform.h>
@@ -31,4 +31,4 @@
extern const grpc_channel_filter grpc_client_authority_filter;
-#endif /* GRPC_CORE_LIB_CHANNEL_CLIENT_AUTHORITY_FILTER_H */
+#endif /* GRPC_CORE_EXT_FILTERS_HTTP_CLIENT_AUTHORITY_FILTER_H */
diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc
index 2d29c7d95f..ac9f9e6066 100644
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@@ -27,7 +27,6 @@
#include <grpc/support/log.h>
#include <grpc/support/time.h>
#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/channel/client_authority_filter.h"
#include "src/core/lib/channel/connected_channel.h"
#include "src/core/lib/channel/handshaker_registry.h"
#include "src/core/lib/debug/stats.h"
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index bb426b070f..5c9107cf2a 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -337,7 +337,7 @@ CORE_SOURCE_FILES = [
'src/core/ext/census/grpc_context.cc',
'src/core/ext/filters/max_age/max_age_filter.cc',
'src/core/ext/filters/message_size/message_size_filter.cc',
- 'src/core/lib/channel/client_authority_filter.cc',
+ 'src/core/ext/filters/http/client_authority_filter.cc',
'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
'src/core/ext/filters/workarounds/workaround_utils.cc',
'src/core/plugin_registry/grpc_plugin_registry.cc',
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 1f19bac169..68e808675e 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -941,6 +941,8 @@ src/core/ext/filters/deadline/deadline_filter.cc \
src/core/ext/filters/deadline/deadline_filter.h \
src/core/ext/filters/http/client/http_client_filter.cc \
src/core/ext/filters/http/client/http_client_filter.h \
+src/core/ext/filters/http/client_authority_filter.cc \
+src/core/ext/filters/http/client_authority_filter.h \
src/core/ext/filters/http/http_filters_plugin.cc \
src/core/ext/filters/http/message_compress/message_compress_filter.cc \
src/core/ext/filters/http/message_compress/message_compress_filter.h \
@@ -1034,8 +1036,6 @@ src/core/lib/channel/channel_stack.cc \
src/core/lib/channel/channel_stack.h \
src/core/lib/channel/channel_stack_builder.cc \
src/core/lib/channel/channel_stack_builder.h \
-src/core/lib/channel/client_authority_filter.cc \
-src/core/lib/channel/client_authority_filter.h \
src/core/lib/channel/connected_channel.cc \
src/core/lib/channel/connected_channel.h \
src/core/lib/channel/context.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 07edd14b04..e5a0d9a247 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -9423,14 +9423,14 @@
"grpc_base"
],
"headers": [
- "src/core/lib/channel/client_authority_filter.h"
+ "src/core/ext/filters/http/client_authority_filter.h"
],
"is_filegroup": true,
"language": "c",
"name": "grpc_client_authority_filter",
"src": [
- "src/core/lib/channel/client_authority_filter.cc",
- "src/core/lib/channel/client_authority_filter.h"
+ "src/core/ext/filters/http/client_authority_filter.cc",
+ "src/core/ext/filters/http/client_authority_filter.h"
],
"third_party": false,
"type": "filegroup"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 12:39:53 +0000