Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

repo reorg: fix proxy proto namespace #2951

Merged
merged 1 commit into from
Mar 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions source/extensions/filters/listener/proxy_protocol/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h"

namespace Envoy {
namespace Filter {
namespace Listener {
namespace Extensions {
namespace ListenerFilters {
namespace ProxyProtocol {

/**
Expand Down Expand Up @@ -42,6 +42,6 @@ static Registry::RegisterFactory<ProxyProtocolConfigFactory,
registered_;

} // namespace ProxyProtocol
} // namespace Listener
} // namespace Filter
} // namespace ListenerFilters
} // namespace Extensions
} // namespace Envoy
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include "common/network/utility.h"

namespace Envoy {
namespace Filter {
namespace Listener {
namespace Extensions {
namespace ListenerFilters {
namespace ProxyProtocol {

Config::Config(Stats::Scope& scope) : stats_{ALL_PROXY_PROTOCOL_STATS(POOL_COUNTER(scope))} {}
Expand Down Expand Up @@ -159,6 +159,6 @@ bool Filter::readLine(int fd, std::string& s) {
}

} // namespace ProxyProtocol
} // namespace Listener
} // namespace Filter
} // namespace ListenerFilters
} // namespace Extensions
} // namespace Envoy
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "common/common/logger.h"

namespace Envoy {
namespace Filter {
namespace Listener {
namespace Extensions {
namespace ListenerFilters {
namespace ProxyProtocol {

/**
Expand Down Expand Up @@ -78,6 +78,6 @@ class Filter : public Network::ListenerFilter, Logger::Loggable<Logger::Id::filt
};

} // namespace ProxyProtocol
} // namespace Listener
} // namespace Filter
} // namespace ListenerFilters
} // namespace Extensions
} // namespace Envoy
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ using testing::Return;
using testing::_;

namespace Envoy {
namespace Filter {
namespace Listener {
namespace Extensions {
namespace ListenerFilters {
namespace ProxyProtocol {

// Build again on the basis of the connection_handler_test.cc
Expand Down Expand Up @@ -443,6 +443,6 @@ TEST_P(WildcardProxyProtocolTest, BasicV6) {
}

} // namespace ProxyProtocol
} // namespace Listener
} // namespace Filter
} // namespace ListenerFilters
} // namespace Extensions
} // namespace Envoy