summaryrefslogtreecommitdiffstats
path: root/src/expr/payload.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2016-11-24 12:08:52 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2016-12-04 21:24:12 +0100
commit75d41c37e0956b3a4d0ae25756fc8fa5ecba16c3 (patch)
tree9b2da1781227f5240b133357c874ef1b0660abe1 /src/expr/payload.c
parentcc1b5986f5379c17c97ff9fb7064aceddf0b87ed (diff)
expr: payload: add NFTNL_EXPR_PAYLOAD_FLAGS
So we can include the new NFT_PAYLOAD_L4CSUM_PSEUDOHDR flag. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/payload.c')
-rw-r--r--src/expr/payload.c22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/expr/payload.c b/src/expr/payload.c
index 17dd4cd..d655857 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -32,6 +32,7 @@ struct nftnl_expr_payload {
uint32_t len;
uint32_t csum_type;
uint32_t csum_offset;
+ uint32_t csum_flags;
};
static int
@@ -62,6 +63,9 @@ nftnl_expr_payload_set(struct nftnl_expr *e, uint16_t type,
case NFTNL_EXPR_PAYLOAD_CSUM_OFFSET:
payload->csum_offset = *((uint32_t *)data);
break;
+ case NFTNL_EXPR_PAYLOAD_FLAGS:
+ payload->csum_flags = *((uint32_t *)data);
+ break;
default:
return -1;
}
@@ -96,6 +100,9 @@ nftnl_expr_payload_get(const struct nftnl_expr *e, uint16_t type,
case NFTNL_EXPR_PAYLOAD_CSUM_OFFSET:
*data_len = sizeof(payload->csum_offset);
return &payload->csum_offset;
+ case NFTNL_EXPR_PAYLOAD_FLAGS:
+ *data_len = sizeof(payload->csum_flags);
+ return &payload->csum_flags;
}
return NULL;
}
@@ -116,6 +123,7 @@ static int nftnl_expr_payload_cb(const struct nlattr *attr, void *data)
case NFTA_PAYLOAD_LEN:
case NFTA_PAYLOAD_CSUM_TYPE:
case NFTA_PAYLOAD_CSUM_OFFSET:
+ case NFTA_PAYLOAD_CSUM_FLAGS:
if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
abi_breakage();
break;
@@ -146,6 +154,9 @@ nftnl_expr_payload_build(struct nlmsghdr *nlh, const struct nftnl_expr *e)
if (e->flags & (1 << NFTNL_EXPR_PAYLOAD_CSUM_OFFSET))
mnl_attr_put_u32(nlh, NFTA_PAYLOAD_CSUM_OFFSET,
htonl(payload->csum_offset));
+ if (e->flags & (1 << NFTNL_EXPR_PAYLOAD_FLAGS))
+ mnl_attr_put_u32(nlh, NFTA_PAYLOAD_CSUM_FLAGS,
+ htonl(payload->csum_flags));
}
static int
@@ -185,6 +196,10 @@ nftnl_expr_payload_parse(struct nftnl_expr *e, struct nlattr *attr)
payload->csum_offset = ntohl(mnl_attr_get_u32(tb[NFTA_PAYLOAD_CSUM_OFFSET]));
e->flags |= (1 << NFTNL_EXPR_PAYLOAD_CSUM_OFFSET);
}
+ if (tb[NFTA_PAYLOAD_CSUM_FLAGS]) {
+ payload->csum_flags = ntohl(mnl_attr_get_u32(tb[NFTA_PAYLOAD_CSUM_FLAGS]));
+ e->flags |= (1 << NFTNL_EXPR_PAYLOAD_FLAGS);
+ }
return 0;
}
@@ -278,11 +293,12 @@ nftnl_expr_payload_snprintf(char *buf, size_t len, uint32_t type,
switch (type) {
case NFTNL_OUTPUT_DEFAULT:
if (payload->sreg)
- return snprintf(buf, len, "write reg %u => %ub @ %s header + %u csum_type %u csum_off %u ",
+ return snprintf(buf, len, "write reg %u => %ub @ %s header + %u csum_type %u csum_off %u csum_flags 0x%x ",
payload->sreg,
payload->len, base2str(payload->base),
payload->offset, payload->csum_type,
- payload->csum_offset);
+ payload->csum_offset,
+ payload->csum_flags);
else
return snprintf(buf, len, "load %ub @ %s header + %u => reg %u ",
payload->len, base2str(payload->base),
@@ -317,6 +333,8 @@ static bool nftnl_expr_payload_cmp(const struct nftnl_expr *e1,
eq &= (p1->csum_type == p2->csum_type);
if (e1->flags & (1 << NFTNL_EXPR_PAYLOAD_CSUM_OFFSET))
eq &= (p1->csum_offset == p2->csum_offset);
+ if (e1->flags & (1 << NFTNL_EXPR_PAYLOAD_FLAGS))
+ eq &= (p1->csum_flags == p2->csum_flags);
return eq;
}