From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sat, 14 Sep 2013 18:48:39 +0000 (+0200)
Subject: xtables: nft-arp: fix endianess in nft_arp_parse_payload
X-Git-Tag: v1.6.0~111^2~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c4bcbcd2523da740ed02021e51cb20b14fae153;p=thirdparty%2Fiptables.git

xtables: nft-arp: fix endianess in nft_arp_parse_payload

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>
---

diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c
index 09b939d0..6ec8a455 100644
--- a/iptables/nft-arp.c
+++ b/iptables/nft-arp.c
@@ -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;