diff options
| author | Phil Sutter <phil@nwl.cc> | 2022-09-27 19:46:47 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2022-09-28 14:21:13 +0200 |
| commit | db420e268735e8499ca16146234ace79a9f1128a (patch) | |
| tree | 936e91a14241535236c2dd72af7269045c2b45f1 /iptables/xshared.h | |
| parent | 39cc849ed0f7ae0e5e09e3a2c278708fd36c8c14 (diff) | |
ebtables: Merge OPT_* flags with xshared ones
Despite also including xshared.h, xtables-eb.c defined its own OPT_*
flags with clashing values. Albeit ugly, this wasn't a problem in
practice until commit 51d9d9e081344 ("ebtables: Support verbose mode")
which introduced use of OPT_VERBOSE from xshared - with same value as
the local OPT_PROTOCOL define.
Eliminate the clash by appending ebtables-specific flags to the xshared
enum and adjust for the different names of some others.
Fixes: 51d9d9e081344 ("ebtables: Support verbose mode")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/xshared.h')
| -rw-r--r-- | iptables/xshared.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/iptables/xshared.h b/iptables/xshared.h index 1a019a7c..f43c28f5 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -37,6 +37,11 @@ enum { OPT_OPCODE = 1 << 15, OPT_H_TYPE = 1 << 16, OPT_P_TYPE = 1 << 17, + /* below are for ebtables only */ + OPT_LOGICALIN = 1 << 18, + OPT_LOGICALOUT = 1 << 19, + OPT_COMMAND = 1 << 20, + OPT_ZERO = 1 << 21, }; enum { |