network filter: fix upstream host storage (#3)

envoyproxy · Aug 10, 2016 · 2eef417 · 2eef417
1 parent 3285c1a
commit 2eef417
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/source/common/network/filter_manager.h b/source/common/network/filter_manager.h
@@ -46,12 +46,13 @@ class FilterManager {
 
     Connection& connection() override { return parent_.connection_; }
     void continueReading() override { parent_.onContinueReading(this); }
-    Upstream::HostDescriptionPtr upstreamHost() override { return host_description_; }
-    void upstreamHost(Upstream::HostDescriptionPtr host) override { host_description_ = host; }
+    Upstream::HostDescriptionPtr upstreamHost() override { return parent_.host_description_; }
+    void upstreamHost(Upstream::HostDescriptionPtr host) override {
+      parent_.host_description_ = host;
+    }
 
     FilterManager& parent_;
     ReadFilterPtr filter_;
-    Upstream::HostDescriptionPtr host_description_;
   };
 
   typedef std::unique_ptr<ActiveReadFilter> ActiveReadFilterPtr;
@@ -62,6 +63,7 @@ class FilterManager {
   BufferSource& buffer_source_;
   std::list<ActiveReadFilterPtr> upstream_filters_;
   std::list<WriteFilterPtr> downstream_filters_;
+  Upstream::HostDescriptionPtr host_description_;
 };
 
 } // Network
diff --git a/test/common/network/filter_manager_test.cc b/test/common/network/filter_manager_test.cc
@@ -3,6 +3,7 @@
 
 #include "test/mocks/buffer/mocks.h"
 #include "test/mocks/network/mocks.h"
+#include "test/mocks/upstream/host.h"
 
 using testing::InSequence;
 using testing::Return;
@@ -30,6 +31,10 @@ TEST_F(NetworkFilterManagerTest, All) {
   manager.addWriteFilter(write_filter);
   manager.addFilter(filter);
 
+  Upstream::HostDescriptionPtr host_description(new Upstream::MockHostDescription());
+  read_filter->callbacks_->upstreamHost(host_description);
+  EXPECT_EQ(read_filter->callbacks_->upstreamHost(), filter->callbacks_->upstreamHost());
+
   read_buffer_.add("hello");
   EXPECT_CALL(*read_filter, onData(BufferStringEqual("hello")))
       .WillOnce(Return(FilterStatus::StopIteration));

diff --git a/test/mocks/upstream/host.h b/test/mocks/upstream/host.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "envoy/upstream/upstream.h"
+
 namespace Upstream {
 
 class MockHostDescription : public HostDescription {