Ensure every instance of StreamFilter and PassThroughFilter to contai…

…n only one copy of StreamFilterBase. (envoyproxy#35341) Change Stream(Decode|Encode)Filter to inherit from StreamFilterBase virtually. Move the default implementation of PassThrough(Decoder|Encode)Filter::onDestroy into StreamFilterBase. --------- Signed-off-by: Bin Wu <[email protected]>
daixiang0 · Aug 1, 2024 · 0fa9e60 · 0fa9e60
1 parent 8b9b23b
commit 0fa9e60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/envoy/http/filter.h b/envoy/http/filter.h
@@ -896,7 +896,7 @@ class StreamFilterBase {
 /**
  * Stream decoder filter interface.
  */
-class StreamDecoderFilter : public StreamFilterBase {
+class StreamDecoderFilter : public virtual StreamFilterBase {
 public:
   /**
    * Called with decoded headers, optionally indicating end of stream.
@@ -1112,7 +1112,7 @@ class StreamEncoderFilterCallbacks : public virtual StreamFilterCallbacks {
 /**
  * Stream encoder filter interface.
  */
-class StreamEncoderFilter : public StreamFilterBase {
+class StreamEncoderFilter : public virtual StreamFilterBase {
 public:
   /**
    * Called with supported 1xx headers.

diff --git a/source/extensions/filters/http/common/pass_through_filter.h b/source/extensions/filters/http/common/pass_through_filter.h
@@ -62,6 +62,10 @@ class PassThroughEncoderFilter : public virtual StreamEncoderFilter {
 // A filter which passes all data through with Continue status.
 class PassThroughFilter : public StreamFilter,
                           public PassThroughDecoderFilter,
-                          public PassThroughEncoderFilter {};
+                          public PassThroughEncoderFilter {
+public:
+  // Http::StreamFilterBase
+  void onDestroy() override {}
+};
 } // namespace Http
 } // namespace Envoy