diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-06-14 15:06:27 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-06-22 22:23:58 +0900 |
commit | b48ed70c79c6482e1f39b77d16e62043ff5042a5 (patch) | |
tree | 58245c4075beb60a8558020b647dc67134beb68e /src/network/networkd-network.h | |
parent | 127b26f3d8b589907ed75a34d34ab330995778f9 (diff) | |
download | systemd-b48ed70c79c6482e1f39b77d16e62043ff5042a5.tar.gz |
Revert NFTSet feature
This reverts PR #22587 and its follow-up commit. More specifically,
2299b1cae32c1fb8911da0ce26efced68032f4f8 (partially),
e176f855278d5098d3fecc5aa24ba702147d42e0,
ceb46a31a01b3d3d1d6095d857e29ea214a2776b, and
51bb9076ab8c050bebb64db5035852385accda35.
The PR was merged without final approval, and has several issues:
- OSS fuzz reported issues in the conf parser,
- It calls synchrnous netlink call, it should not be especially in PID1,
- The importance of NFTSet for CGroup and DynamicUser may be
questionable, at least, there was no justification PID1 should support
it.
- For networkd, it should be implemented with Request object,
- There is no test for the feature.
Fixes #23711.
Fixes #23717.
Fixes #23719.
Fixes #23720.
Fixes #23721.
Fixes #23759.
Diffstat (limited to 'src/network/networkd-network.h')
-rw-r--r-- | src/network/networkd-network.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 6d0748aedc..96cd316e01 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -10,7 +10,6 @@ #include "bridge.h" #include "condition.h" #include "conf-parser.h" -#include "firewall-util.h" #include "hashmap.h" #include "ipoib.h" #include "net-condition.h" @@ -157,8 +156,6 @@ struct Network { OrderedHashmap *dhcp_client_send_options; OrderedHashmap *dhcp_client_send_vendor_options; Set *dhcp_netlabels; - NFTSetContext *dhcp_nft_set_context; - size_t n_dhcp_nft_set_contexts; /* DHCPv6 Client support */ bool dhcp6_use_address; @@ -184,8 +181,6 @@ struct Network { OrderedHashmap *dhcp6_client_send_vendor_options; Set *dhcp6_request_options; Set *dhcp6_netlabels; - NFTSetContext *dhcp6_nft_set_context; - size_t n_dhcp6_nft_set_contexts; /* DHCP Server Support */ bool dhcp_server; @@ -243,8 +238,6 @@ struct Network { int dhcp_pd_uplink_index; char *dhcp_pd_uplink_name; Set *dhcp_pd_netlabels; - NFTSetContext *dhcp_pd_nft_set_context; - size_t n_dhcp_pd_nft_set_contexts; /* Bridge Support */ int use_bpdu; @@ -330,8 +323,6 @@ struct Network { Set *ndisc_allow_listed_route_prefix; Set *ndisc_tokens; Set *ndisc_netlabels; - NFTSetContext *ndisc_nft_set_context; - size_t n_ndisc_nft_set_contexts; /* LLDP support */ LLDPMode lldp_mode; /* LLDP reception */ @@ -397,10 +388,6 @@ CONFIG_PARSER_PROTOTYPE(config_parse_keep_configuration); CONFIG_PARSER_PROTOTYPE(config_parse_activation_policy); CONFIG_PARSER_PROTOTYPE(config_parse_link_group); CONFIG_PARSER_PROTOTYPE(config_parse_ignore_carrier_loss); -CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_nft_set_context); -CONFIG_PARSER_PROTOTYPE(config_parse_dhcp6_nft_set_context); -CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_pd_nft_set_context); -CONFIG_PARSER_PROTOTYPE(config_parse_ndisc_nft_set_context); const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |