Revert: listener: remove the peek from the listener filters

docs/root/configuration/listeners/listener_filters/tls_inspector.rst

@@ -41,7 +41,9 @@ This filter has a statistics tree rooted at *tls_inspector* with the following s
   :header: Name, Type, Description
   :widths: 1, 1, 2
 
+  connection_closed, Counter, Total connections closed
   client_hello_too_large, Counter, Total unreasonably large Client Hello received
+  read_error, Counter, Total read errors
   tls_found, Counter, Total number of times TLS was found
   tls_not_found, Counter, Total number of times TLS was not found
   alpn_found, Counter, Total number of times `Application-Layer Protocol Negotiation <https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation>`_ was successful

docs/root/configuration/listeners/stats.rst

@@ -26,8 +26,6 @@ with the following statistics:
    downstream_pre_cx_active, Gauge, Sockets currently undergoing listener filter processing
    global_cx_overflow, Counter, Total connections rejected due to enforcement of the global connection limit
    no_filter_chain_match, Counter, Total connections that didn't match any filter chain
-   downstream_listener_filter_remote_close, Counter, Total connections closed by remote when peek data for listener filters
-   downstream_listener_filter_error, Counter, Total numbers of error when peek data for listener filters
 
 .. _config_listener_stats_tls:
 

docs/root/version_history/current.rst

@@ -7,7 +7,6 @@ Incompatible Behavior Changes
 
 * sip-proxy: change API by replacing ``own_domain`` with :ref:`local_services <envoy_v3_api_msg_extensions.filters.network.sip_proxy.v3alpha.LocalService>`.
 * tls: set TLS v1.2 as the default minimal version for servers. Users can still explicitly opt-in to 1.0 and 1.1 using :ref:`tls_minimum_protocol_version <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsParameters.tls_minimum_protocol_version>`.
-* tls-inspector: the listener filter tls inspector's stats ``connection_closed`` and ``read_error`` are removed. The new stats are introduced for listener, ``downstream_peek_remote_close`` and ``read_error`` :ref:`listener stats <config_listener_stats>`.
 
 Minor Behavior Changes
 ----------------------

envoy/buffer/buffer.h

@@ -34,17 +34,6 @@ struct RawSlice {
   bool operator!=(const RawSlice& rhs) const { return !(*this == rhs); }
 };
 
-/**
- * A const raw memory data slice including the location and length.
- */
-struct ConstRawSlice {
-  const void* mem_ = nullptr;
-  size_t len_ = 0;
-
-  bool operator==(const RawSlice& rhs) const { return mem_ == rhs.mem_ && len_ == rhs.len_; }
-  bool operator!=(const RawSlice& rhs) const { return !(*this == rhs); }
-};
-
 using RawSliceVector = absl::InlinedVector<RawSlice, 16>;
 
 /**

envoy/network/BUILD

@@ -99,7 +99,6 @@ envoy_cc_library(
     hdrs = ["filter.h"],
     deps = [
         ":listen_socket_interface",
-        ":listener_filter_buffer_interface",
         ":transport_socket_interface",
         "//envoy/buffer:buffer_interface",
         "//envoy/stream_info:stream_info_interface",
@@ -161,14 +160,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "listener_filter_buffer_interface",
-    hdrs = ["listener_filter_buffer.h"],
-    deps = [
-        "//envoy/buffer:buffer_interface",
-    ],
-)
-
 envoy_cc_library(
     name = "transport_socket_interface",
     hdrs = ["transport_socket.h"],

envoy/network/filter.h

@@ -4,7 +4,6 @@
 
 #include "envoy/buffer/buffer.h"
 #include "envoy/network/listen_socket.h"
-#include "envoy/network/listener_filter_buffer.h"
 #include "envoy/network/transport_socket.h"
 #include "envoy/stream_info/stream_info.h"
 #include "envoy/upstream/host_description.h"
@@ -331,20 +330,6 @@ class ListenerFilter {
    * @return status used by the filter manager to manage further filter iteration.
    */
   virtual FilterStatus onAccept(ListenerFilterCallbacks& cb) PURE;
-
-  /**
-   * Called when data read from the connection. If the filter chain doesn't get
-   * enough data, the filter chain can be stopped, then waiting for more data.
-   * @param buffer the buffer of data.
-   * @return status used by the filter manager to manage further filter iteration.
-   */
-  virtual FilterStatus onData(Network::ListenerFilterBuffer& buffer) PURE;
-
-  /**
-   * Return the size of data the filter want to inspect from the connection.
-   * @return the size of data inspect from the connection. 0 means filter needn't any data.
-   */
-  virtual size_t maxReadBytes() const PURE;
 };
 
 using ListenerFilterPtr = std::unique_ptr<ListenerFilter>;

source/common/network/BUILD

@@ -269,17 +269,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "listener_filter_buffer_lib",
-    srcs = ["listener_filter_buffer_impl.cc"],
-    hdrs = ["listener_filter_buffer_impl.h"],
-    deps = [
-        "//envoy/network:io_handle_interface",
-        "//envoy/network:listener_filter_buffer_interface",
-        "//source/common/buffer:buffer_lib",
-    ],
-)
-
 envoy_cc_library(
     name = "listener_lib",
     srcs = [