summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorShivani Bhardwaj <shivanib134@gmail.com>2016-06-01 23:38:27 +0530
committerPablo Neira Ayuso <pablo@netfilter.org>2016-06-02 13:06:03 +0200
commit2bd49c03c8601aff8f951a8153e95bfdeb7b84d8 (patch)
treece6d8d2e27c6c7e954af415502c23a15ee9d8119 /extensions
parentddc76d5205836e60db556362a111102e7a1ff001 (diff)
extensions: libxt_connmark: Fix order of mask and mark
The order of mask and mark in the output is wrong. This has been pointed out: http://git.netfilter.org/iptables/commit/?id=8548dd253833027c68ac6400c3118ef788fabe5d by Liping Zhang <liping.zhang@spreadtrum.com>. This patch fixes the same issue with connmark. Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/libxt_connmark.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c
index fbfeb743..958a50ce 100644
--- a/extensions/libxt_connmark.c
+++ b/extensions/libxt_connmark.c
@@ -127,8 +127,8 @@ static void print_mark_xlate(unsigned int mark, unsigned int mask,
struct xt_xlate *xl, uint32_t op)
{
if (mask != 0xffffffffU)
- xt_xlate_add(xl, " and 0x%x %s 0x%x ", mark,
- op == XT_OP_EQ ? "==" : "!=", mask);
+ xt_xlate_add(xl, " and 0x%x %s 0x%x ", mask,
+ op == XT_OP_EQ ? "==" : "!=", mark);
else
xt_xlate_add(xl, " %s0x%x ",
op == XT_OP_EQ ? "" : "!= ", mark);