diff options
| author | Florian Westphal <fw@strlen.de> | 2020-01-14 13:37:28 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2020-01-14 14:35:59 +0100 |
| commit | 488356b895024d0944b20feb1f930558726e0877 (patch) | |
| tree | 282a7889654a37f5bb2c7258d276e7796ab6a2cf | |
| parent | ddbacd70d061eb1b6808f501969809bfb5d03001 (diff) | |
xfrm: spi is big-endian
the kernel stores spi in a __be32, so fix up the byteorder annotation.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/xfrm.c | 2 | ||||
| -rw-r--r-- | tests/py/inet/ipsec.t.payload | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -39,7 +39,7 @@ const struct xfrm_template xfrm_templates[] = { [NFT_XFRM_KEY_DADDR_IP6] = XFRM_TEMPLATE_BE("daddr", &ip6addr_type, 16 * BITS_PER_BYTE), [NFT_XFRM_KEY_SADDR_IP6] = XFRM_TEMPLATE_BE("saddr", &ip6addr_type, 16 * BITS_PER_BYTE), [NFT_XFRM_KEY_REQID] = XFRM_TEMPLATE_HE("reqid", &integer_type, 4 * BITS_PER_BYTE), - [NFT_XFRM_KEY_SPI] = XFRM_TEMPLATE_HE("spi", &integer_type, 4 * BITS_PER_BYTE), + [NFT_XFRM_KEY_SPI] = XFRM_TEMPLATE_BE("spi", &integer_type, 4 * BITS_PER_BYTE), }; static void xfrm_expr_print(const struct expr *expr, struct output_ctx *octx) diff --git a/tests/py/inet/ipsec.t.payload b/tests/py/inet/ipsec.t.payload index 6049c664..c46a2263 100644 --- a/tests/py/inet/ipsec.t.payload +++ b/tests/py/inet/ipsec.t.payload @@ -16,7 +16,6 @@ ip ipsec-ip4 ipsec-input # ipsec out spi 1-561 inet ipsec-inet ipsec-post [ xfrm load out 0 spi => reg 1 ] - [ byteorder reg 1 = hton(reg 1, 4, 4) ] [ cmp gte reg 1 0x01000000 ] [ cmp lte reg 1 0x31020000 ] |