Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
www/envoy: add five more soon to-be-needed patches
Replace more of those REGISTER_FACTORY macros which our default compiler does not seem to digest with LEGACY_REGISTER_FACTORY.
- Loading branch information
Alexey Dokuchaev
authored and
Alexey Dokuchaev
committed
Jun 15, 2023
1 parent
17fdd64
commit 37e7436
Showing
5 changed files
with
63 additions
and
0 deletions.
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
www/envoy/files/patch-source_extensions_filters_listener_http__inspector_config.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- source/extensions/filters/listener/http_inspector/config.cc.orig 2023-04-27 12:00:08 UTC | ||
| +++ source/extensions/filters/listener/http_inspector/config.cc | ||
| @@ -38,9 +38,7 @@ class HttpInspectorConfigFactory : public Server::Conf | ||
| /** | ||
| * Static registration for the http inspector filter. @see RegisterFactory. | ||
| */ | ||
| -REGISTER_FACTORY(HttpInspectorConfigFactory, | ||
| - Server::Configuration::NamedListenerFilterConfigFactory){ | ||
| - "envoy.listener.http_inspector"}; | ||
| +LEGACY_REGISTER_FACTORY(HttpInspectorConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.http_inspector"); | ||
|
|
||
| } // namespace HttpInspector | ||
| } // namespace ListenerFilters |
12 changes: 12 additions & 0 deletions
12
www/envoy/files/patch-source_extensions_filters_listener_original__dst_config.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- source/extensions/filters/listener/original_dst/config.cc.orig 2023-04-27 12:00:08 UTC | ||
| +++ source/extensions/filters/listener/original_dst/config.cc | ||
| @@ -56,8 +56,7 @@ class OriginalDstConfigFactory : public Server::Config | ||
| /** | ||
| * Static registration for the original dst filter. @see RegisterFactory. | ||
| */ | ||
| -REGISTER_FACTORY(OriginalDstConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory){ | ||
| - "envoy.listener.original_dst"}; | ||
| +LEGACY_REGISTER_FACTORY(OriginalDstConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.original_dst"); | ||
|
|
||
| } // namespace OriginalDst | ||
| } // namespace ListenerFilters |
12 changes: 12 additions & 0 deletions
12
.../patch-source_extensions_filters_listener_original__src_original__src__config__factory.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- source/extensions/filters/listener/original_src/original_src_config_factory.cc.orig 2023-04-27 12:00:08 UTC | ||
| +++ source/extensions/filters/listener/original_src/original_src_config_factory.cc | ||
| @@ -32,8 +32,7 @@ ProtobufTypes::MessagePtr OriginalSrcConfigFactory::cr | ||
| /** | ||
| * Static registration for the original_src filter. @see RegisterFactory. | ||
| */ | ||
| -REGISTER_FACTORY(OriginalSrcConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory){ | ||
| - "envoy.listener.original_src"}; | ||
| +LEGACY_REGISTER_FACTORY(OriginalSrcConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.original_src"); | ||
|
|
||
| } // namespace OriginalSrc | ||
| } // namespace ListenerFilters |
13 changes: 13 additions & 0 deletions
13
www/envoy/files/patch-source_extensions_filters_listener_proxy__protocol_config.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- source/extensions/filters/listener/proxy_protocol/config.cc.orig 2023-04-27 12:00:08 UTC | ||
| +++ source/extensions/filters/listener/proxy_protocol/config.cc | ||
| @@ -46,9 +46,7 @@ class ProxyProtocolConfigFactory : public Server::Conf | ||
| /** | ||
| * Static registration for the proxy protocol filter. @see RegisterFactory. | ||
| */ | ||
| -REGISTER_FACTORY(ProxyProtocolConfigFactory, | ||
| - Server::Configuration::NamedListenerFilterConfigFactory){ | ||
| - "envoy.listener.proxy_protocol"}; | ||
| +LEGACY_REGISTER_FACTORY(ProxyProtocolConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.proxy_protocol"); | ||
|
|
||
| } // namespace ProxyProtocol | ||
| } // namespace ListenerFilters |
13 changes: 13 additions & 0 deletions
13
www/envoy/files/patch-source_extensions_filters_listener_tls__inspector_config.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- source/extensions/filters/listener/tls_inspector/config.cc.orig 2023-04-27 12:00:08 UTC | ||
| +++ source/extensions/filters/listener/tls_inspector/config.cc | ||
| @@ -46,9 +46,7 @@ class TlsInspectorConfigFactory : public Server::Confi | ||
| /** | ||
| * Static registration for the TLS inspector filter. @see RegisterFactory. | ||
| */ | ||
| -REGISTER_FACTORY(TlsInspectorConfigFactory, | ||
| - Server::Configuration::NamedListenerFilterConfigFactory){ | ||
| - "envoy.listener.tls_inspector"}; | ||
| +LEGACY_REGISTER_FACTORY(TlsInspectorConfigFactory, Server::Configuration::NamedListenerFilterConfigFactory, "envoy.listener.tls_inspector"); | ||
|
|
||
| } // namespace TlsInspector | ||
| } // namespace ListenerFilters |