]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
xtables: nft-arp: fix endianess in nft_arp_parse_payload
authorPablo Neira Ayuso <pablo@netfilter.org>
Sat, 14 Sep 2013 18:48:39 +0000 (20:48 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 30 Dec 2013 22:50:46 +0000 (23:50 +0100)
nft_arp_print_firewall already handles endianess appropriately.
This fixes the output of the option that allows you to match
ARP header fields.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
iptables/nft-arp.c

index 09b939d075089d7a0c0da5897808a5df8fa5fe0c..6ec8a455de430f4a5a54462e43eb633d66a30aa0 100644 (file)
@@ -287,22 +287,22 @@ static void nft_arp_parse_payload(struct nft_rule_expr_iter *iter,
        switch (offset) {
        case offsetof(struct arphdr, ar_hrd):
                get_cmp_data(iter, &ar_hrd, sizeof(ar_hrd), &inv);
-               fw->arp.arhrd = htons(ar_hrd);
-               fw->arp.arhrd_mask = htons(0xffff);
+               fw->arp.arhrd = ar_hrd;
+               fw->arp.arhrd_mask = 0xffff;
                if (inv)
                        fw->arp.invflags |= ARPT_INV_ARPHRD;
                break;
        case offsetof(struct arphdr, ar_pro):
                get_cmp_data(iter, &ar_pro, sizeof(ar_pro), &inv);
-               fw->arp.arpro = htons(ar_pro);
-               fw->arp.arpro_mask = htons(0xffff);
+               fw->arp.arpro = ar_pro;
+               fw->arp.arpro_mask = 0xffff;
                if (inv)
                        fw->arp.invflags |= ARPT_INV_ARPPRO;
                break;
        case offsetof(struct arphdr, ar_op):
                get_cmp_data(iter, &ar_op, sizeof(ar_op), &inv);
-               fw->arp.arpop = htons(ar_op);
-               fw->arp.arpop_mask = htons(0xffff);
+               fw->arp.arpop = ar_op;
+               fw->arp.arpop_mask = 0xffff;
                if (inv)
                        fw->arp.invflags |= ARPT_INV_ARPOP;
                break;