So user does not have to play integer arithmetics to match on IPv4
address.
Before:
# nft describe ip option lsrr addr
exthdr expression, datatype integer (integer), 32 bits
After:
# nft describe ip option lsrr addr
exthdr expression, datatype ipv4_addr (IPv4 address) (basetype integer), 32 bits
Fixes: 226a0e072d5c ("exthdr: add support for matching IPv4 options")
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
---
v2: incorrect mangling of ip option ra.
src/ipopt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ipopt.c b/src/ipopt.c
index 37f779d468ab..c03a80415fe2 100644
--- a/src/ipopt.c
+++ b/src/ipopt.c
@@ -24,7 +24,7 @@ static const struct exthdr_desc ipopt_lsrr = {
[IPOPT_FIELD_TYPE] = PHT("type", 0, 8),
[IPOPT_FIELD_LENGTH] = PHT("length", 8, 8),
[IPOPT_FIELD_PTR] = PHT("ptr", 16, 8),
- [IPOPT_FIELD_ADDR_0] = PHT("addr", 24, 32),
+ [IPOPT_FIELD_ADDR_0] = PROTO_HDR_TEMPLATE("addr", &ipaddr_type, BYTEORDER_BIG_ENDIAN, 24, 32),
},
};
@@ -35,7 +35,7 @@ static const struct exthdr_desc ipopt_rr = {
[IPOPT_FIELD_TYPE] = PHT("type", 0, 8),
[IPOPT_FIELD_LENGTH] = PHT("length", 8, 8),
[IPOPT_FIELD_PTR] = PHT("ptr", 16, 8),
- [IPOPT_FIELD_ADDR_0] = PHT("addr", 24, 32),
+ [IPOPT_FIELD_ADDR_0] = PROTO_HDR_TEMPLATE("addr", &ipaddr_type, BYTEORDER_BIG_ENDIAN, 24, 32),
},
};
@@ -46,7 +46,7 @@ static const struct exthdr_desc ipopt_ssrr = {
[IPOPT_FIELD_TYPE] = PHT("type", 0, 8),
[IPOPT_FIELD_LENGTH] = PHT("length", 8, 8),
[IPOPT_FIELD_PTR] = PHT("ptr", 16, 8),
- [IPOPT_FIELD_ADDR_0] = PHT("addr", 24, 32),
+ [IPOPT_FIELD_ADDR_0] = PROTO_HDR_TEMPLATE("addr", &ipaddr_type, BYTEORDER_BIG_ENDIAN, 24, 32),
},
};
--
2.30.2
