proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-11-03 19:11:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: adjust xtables_match and xtables_target to changes in recent iptables

Browse Source 
iptables commit 933400b37d09 ("nft: xtables: add the infrastructure to translate from iptables to nft")
added an additional member to struct xtables_match and struct xtables_target.

This change is available for libxtables12 and up.
Add these members conditionally to support both newer and older versions.

Fixes: dd29621578 ("tc: add em_ipt ematch for calling xtables matches from tc matching context")
Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Eyal Birger 2019-06-24 18:14:57 +03:00 committed by Stephen Hemminger
parent 6d77d9c6ae
commit bfa757e02f
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/xtables.h
View File

@ -206,6 +206,24 @@ enum xtables_ext_flags {
XTABLES_EXT_ALIAS = 1 << 0,
};
#if XTABLES_VERSION_CODE >= 12
struct xt_xlate;
struct xt_xlate_mt_params {
const void *ip;
const struct xt_entry_match *match;
int numeric;
bool escape_quotes;
};
struct xt_xlate_tg_params {
const void *ip;
const struct xt_entry_target *target;
int numeric;
bool escape_quotes;
};
#endif
/* Include file for additions: new matches and targets. */
struct xtables_match
{
@ -270,6 +288,12 @@ struct xtables_match
void (*x6_fcheck)(struct xt_fcheck_call *);
const struct xt_option_entry *x6_options;
#if XTABLES_VERSION_CODE >= 12
/* Translate iptables to nft */
int (*xlate)(struct xt_xlate *xl,
const struct xt_xlate_mt_params *params);
#endif
/* Size of per-extension instance extra "global" scratch space */
size_t udata_size;
@ -347,6 +371,12 @@ struct xtables_target
void (*x6_fcheck)(struct xt_fcheck_call *);
const struct xt_option_entry *x6_options;
#if XTABLES_VERSION_CODE >= 12
/* Translate iptables to nft */
int (*xlate)(struct xt_xlate *xl,
const struct xt_xlate_tg_params *params);
#endif
size_t udata_size;
/* Ignore these men behind the curtain: */