fix: record recovered local address (#13581)

Signed-off-by: Kuat Yessenov <kuat@google.com>
envoyproxy · Oct 19, 2020 · 7915659 · 7915659
1 parent 5c77372
commit 7915659
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/source/server/connection_handler_impl.cc b/source/server/connection_handler_impl.cc
@@ -458,6 +458,10 @@ void ConnectionHandlerImpl::ActiveTcpListener::resumeListening() {
 
 void ConnectionHandlerImpl::ActiveTcpListener::newConnection(
     Network::ConnectionSocketPtr&& socket, std::unique_ptr<StreamInfo::StreamInfo> stream_info) {
+  // Refresh local address in case it was restored by a listener filter like the original_dst
+  // filter.
+  stream_info->setDownstreamLocalAddress(socket->localAddress());
+
   // Find matching filter chain.
   const auto filter_chain = config_->filterChainManager().findFilterChain(*socket);
   if (filter_chain == nullptr) {

diff --git a/test/server/connection_handler_test.cc b/test/server/connection_handler_test.cc
@@ -604,7 +604,12 @@ TEST_F(ConnectionHandlerTest, NormalRedirect) {
   EXPECT_EQ(1UL, TestUtility::findCounter(stats_store_, "test.downstream_cx_total")->value());
   EXPECT_EQ(1UL, TestUtility::findGauge(stats_store_, "test.downstream_cx_active")->value());
 
-  EXPECT_CALL(*access_log_, log(_, _, _, _)).Times(1);
+  EXPECT_CALL(*access_log_, log(_, _, _, _))
+      .WillOnce(
+          Invoke([&](const Http::RequestHeaderMap*, const Http::ResponseHeaderMap*,
+                     const Http::ResponseTrailerMap*, const StreamInfo::StreamInfo& stream_info) {
+            EXPECT_EQ(alt_address, stream_info.downstreamLocalAddress());
+          }));
   connection->close(Network::ConnectionCloseType::NoFlush);
   dispatcher_.clearDeferredDeleteList();
   EXPECT_EQ(0UL, TestUtility::findGauge(stats_store_, "downstream_cx_active")->value());