From f2690ca8428d29bfa4be3c28304813de65f10523 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 13 May 2019 15:32:01 +0200 Subject: Merge CMD_* defines They are mostly identical, just xtables-arp ones differ slightly. Though since they are internal use only and their actual value doesn't matter (as long as it's a distinct bit), they can be merged anyway. Signed-off-by: Phil Sutter Acked-by: Pablo Neira Ayuso --- iptables/ip6tables.c | 17 ----------------- iptables/iptables.c | 17 ----------------- iptables/nft-shared.h | 17 ----------------- iptables/xshared.h | 20 ++++++++++++++++++++ iptables/xtables-arp.c | 20 -------------------- iptables/xtables.c | 2 -- 6 files changed, 20 insertions(+), 73 deletions(-) (limited to 'iptables') diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c index f4ccfc60..e48fdeb1 100644 --- a/iptables/ip6tables.c +++ b/iptables/ip6tables.c @@ -52,23 +52,6 @@ #define FALSE 0 #endif -#define CMD_NONE 0x0000U -#define CMD_INSERT 0x0001U -#define CMD_DELETE 0x0002U -#define CMD_DELETE_NUM 0x0004U -#define CMD_REPLACE 0x0008U -#define CMD_APPEND 0x0010U -#define CMD_LIST 0x0020U -#define CMD_FLUSH 0x0040U -#define CMD_ZERO 0x0080U -#define CMD_NEW_CHAIN 0x0100U -#define CMD_DELETE_CHAIN 0x0200U -#define CMD_SET_POLICY 0x0400U -#define CMD_RENAME_CHAIN 0x0800U -#define CMD_LIST_RULES 0x1000U -#define CMD_ZERO_NUM 0x2000U -#define CMD_CHECK 0x4000U -#define NUMBER_OF_CMD 16 #define NUMBER_OF_OPT ARRAY_SIZE(optflags) static const char optflags[] diff --git a/iptables/iptables.c b/iptables/iptables.c index df371f41..255b61b1 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -48,23 +48,6 @@ #define FALSE 0 #endif -#define CMD_NONE 0x0000U -#define CMD_INSERT 0x0001U -#define CMD_DELETE 0x0002U -#define CMD_DELETE_NUM 0x0004U -#define CMD_REPLACE 0x0008U -#define CMD_APPEND 0x0010U -#define CMD_LIST 0x0020U -#define CMD_FLUSH 0x0040U -#define CMD_ZERO 0x0080U -#define CMD_NEW_CHAIN 0x0100U -#define CMD_DELETE_CHAIN 0x0200U -#define CMD_SET_POLICY 0x0400U -#define CMD_RENAME_CHAIN 0x0800U -#define CMD_LIST_RULES 0x1000U -#define CMD_ZERO_NUM 0x2000U -#define CMD_CHECK 0x4000U -#define NUMBER_OF_CMD 16 #define OPT_FRAGMENT 0x00800U #define NUMBER_OF_OPT ARRAY_SIZE(optflags) diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h index 8b073b18..e236a981 100644 --- a/iptables/nft-shared.h +++ b/iptables/nft-shared.h @@ -199,23 +199,6 @@ struct xtables_args { unsigned long long pcnt_cnt, bcnt_cnt; }; -#define CMD_NONE 0x0000U -#define CMD_INSERT 0x0001U -#define CMD_DELETE 0x0002U -#define CMD_DELETE_NUM 0x0004U -#define CMD_REPLACE 0x0008U -#define CMD_APPEND 0x0010U -#define CMD_LIST 0x0020U -#define CMD_FLUSH 0x0040U -#define CMD_ZERO 0x0080U -#define CMD_NEW_CHAIN 0x0100U -#define CMD_DELETE_CHAIN 0x0200U -#define CMD_SET_POLICY 0x0400U -#define CMD_RENAME_CHAIN 0x0800U -#define CMD_LIST_RULES 0x1000U -#define CMD_ZERO_NUM 0x2000U -#define CMD_CHECK 0x4000U - struct nft_xt_cmd_parse { unsigned int command; unsigned int rulenum; diff --git a/iptables/xshared.h b/iptables/xshared.h index 85bbfa12..b0738b04 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -31,6 +31,26 @@ enum { OPT_COUNTERS = 1 << 10, }; +enum { + CMD_NONE = 0, + CMD_INSERT = 1 << 0, + CMD_DELETE = 1 << 1, + CMD_DELETE_NUM = 1 << 2, + CMD_REPLACE = 1 << 3, + CMD_APPEND = 1 << 4, + CMD_LIST = 1 << 5, + CMD_FLUSH = 1 << 6, + CMD_ZERO = 1 << 7, + CMD_NEW_CHAIN = 1 << 8, + CMD_DELETE_CHAIN = 1 << 9, + CMD_SET_POLICY = 1 << 10, + CMD_RENAME_CHAIN = 1 << 11, + CMD_LIST_RULES = 1 << 12, + CMD_ZERO_NUM = 1 << 13, + CMD_CHECK = 1 << 14, +}; +#define NUMBER_OF_CMD 16 + struct xtables_globals; struct xtables_rule_match; struct xtables_target; diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index 79cc83d3..88a7d534 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -62,26 +62,6 @@ typedef char arpt_chainlabel[32]; #define FALSE 0 #endif -/* XXX: command defined by nft-shared.h do not overlap with these two */ -#undef CMD_CHECK -#undef CMD_RENAME_CHAIN - -#define CMD_NONE 0x0000U -#define CMD_INSERT 0x0001U -#define CMD_DELETE 0x0002U -#define CMD_DELETE_NUM 0x0004U -#define CMD_REPLACE 0x0008U -#define CMD_APPEND 0x0010U -#define CMD_LIST 0x0020U -#define CMD_FLUSH 0x0040U -#define CMD_ZERO 0x0080U -#define CMD_NEW_CHAIN 0x0100U -#define CMD_DELETE_CHAIN 0x0200U -#define CMD_SET_POLICY 0x0400U -#define CMD_CHECK 0x0800U -#define CMD_RENAME_CHAIN 0x1000U -#define NUMBER_OF_CMD 13 - #define OPTION_OFFSET 256 #define OPT_NONE 0x00000U diff --git a/iptables/xtables.c b/iptables/xtables.c index bb76e6a7..805bd801 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -50,8 +50,6 @@ #define FALSE 0 #endif -#define NUMBER_OF_CMD 16 - #define OPT_FRAGMENT 0x00800U #define NUMBER_OF_OPT ARRAY_SIZE(optflags) static const char optflags[] -- cgit v1.2.3