diff options
| author | Shivani Bhardwaj <shivanib134@gmail.com> | 2015-12-23 19:43:19 +0530 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-02-16 19:30:22 +0100 |
| commit | e172b5f5920674b7992a124e335664e34a006b90 (patch) | |
| tree | 977840293e750eb7def53666155a433db56816f3 /extensions/libxt_mark.c | |
| parent | 14b647d2edfb85fa93336cdf41348ec471410228 (diff) | |
extensions: libxt_mark: Fix inversion code
Fix the code associated with invert flag.
Examples:
$ sudo iptables-translate -I INPUT -p tcp -m mark ! --mark 0xa/0xa
nft insert rule ip filter INPUT ip protocol tcp mark and 0xa != 0xa counter
$ sudo iptables-translate -I INPUT -p tcp -m mark ! --mark 0x1
nft insert rule ip filter INPUT ip protocol tcp mark != 0x1 counter
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'extensions/libxt_mark.c')
| -rw-r--r-- | extensions/libxt_mark.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index 3b96a342..93d38d90 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -103,13 +103,15 @@ mark_save(const void *ip, const struct xt_entry_match *match) } static void -print_mark_xlate(struct xt_buf *buf, - unsigned int mark, unsigned int mask) +print_mark_xlate(struct xt_buf *buf, unsigned int mark, + unsigned int mask, uint32_t op) { if (mask != 0xffffffffU) - xt_buf_add(buf, " and 0x%x == 0x%x ", mark, mask); + xt_buf_add(buf, " and 0x%x %s 0x%x ", mark, + op == XT_OP_EQ ? "==" : "!=", mask); else - xt_buf_add(buf, " 0x%x ", mark); + xt_buf_add(buf, " %s0x%x ", + op == XT_OP_EQ ? "" : "!= ", mark); } static int @@ -117,9 +119,13 @@ mark_mt_xlate(const struct xt_entry_match *match, struct xt_buf *buf, int numeric) { const struct xt_mark_mtinfo1 *info = (const void *)match->data; + enum xt_op op = XT_OP_EQ; - xt_buf_add(buf, "mark%s", info->invert ? " !=" : ""); - print_mark_xlate(buf, info->mark, info->mask); + if (info->invert) + op = XT_OP_NEQ; + + xt_buf_add(buf, "mark"); + print_mark_xlate(buf, info->mark, info->mask, op); return 1; } @@ -129,9 +135,13 @@ mark_xlate(const struct xt_entry_match *match, struct xt_buf *buf, int numeric) { const struct xt_mark_info *info = (const void *)match->data; + enum xt_op op = XT_OP_EQ; + + if (info->invert) + op = XT_OP_NEQ; - xt_buf_add(buf, "mark%s", info->invert ? " !=" : ""); - print_mark_xlate(buf, info->mark, info->mask); + xt_buf_add(buf, "mark"); + print_mark_xlate(buf, info->mark, info->mask, op); return 1; } |