use requestStreamInfo() directly

Signed-off-by: ohadvano <[email protected]>
ohadvano · Sep 10, 2023 · 34fd252 · 34fd252
1 parent d12d47b
commit 34fd252
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/source/common/tcp_proxy/tcp_proxy.h b/source/common/tcp_proxy/tcp_proxy.h
@@ -423,6 +423,10 @@ class Filter : public Network::ReadFilter,
     return &read_callbacks_->connection();
   }
 
+  const StreamInfo::StreamInfo* requestStreamInfo() const override {
+    return &read_callbacks_->connection().streamInfo();
+  }
+
   Network::TransportSocketOptionsConstSharedPtr upstreamTransportSocketOptions() const override {
     return transport_socket_options_;
   }

diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc
@@ -311,11 +311,9 @@ Cluster::LoadBalancer::chooseHost(Upstream::LoadBalancerContext* context) {
   }
 
   const Router::StringAccessor* dynamic_host_filter_state = nullptr;
-  if (context->downstreamConnection()) {
+  if (context->requestStreamInfo()) {
     dynamic_host_filter_state =
-        context->downstreamConnection()
-            ->streamInfo()
-            .filterState()
+        context->requestStreamInfo()->filterState()
             .getDataReadOnly<Router::StringAccessor>("envoy.upstream.dynamic_host");
   }
 
@@ -338,11 +336,9 @@ Cluster::LoadBalancer::chooseHost(Upstream::LoadBalancerContext* context) {
                              .resolve(nullptr)
                              .factory_.implementsSecureTransport();
   uint32_t port = is_secure ? 443 : 80;
-  if (context->downstreamConnection()) {
+  if (context->requestStreamInfo()) {
     const StreamInfo::UInt32Accessor* dynamic_port_filter_state =
-        context->downstreamConnection()
-            ->streamInfo()
-            .filterState()
+        context->requestStreamInfo()->filterState()
             .getDataReadOnly<StreamInfo::UInt32Accessor>("envoy.upstream.dynamic_port");
     if (dynamic_port_filter_state != nullptr && dynamic_port_filter_state->value() > 0 &&
         dynamic_port_filter_state->value() <= 65535) {