diff options
| -rw-r--r-- | include/proto.h | 11 | ||||
| -rw-r--r-- | src/payload.c | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/proto.h b/include/proto.h index de58d4cc..6a280367 100644 --- a/include/proto.h +++ b/include/proto.h @@ -2,6 +2,7 @@ #define NFTABLES_PROTO_H #include <nftables.h> +#include <linux/netfilter/nf_tables.h> /** * enum proto_bases - protocol bases @@ -30,12 +31,14 @@ extern const char *proto_base_tokens[]; * @dtype: data type of the header field * @offset: offset of the header field from base * @len: length of header field + * @meta_key: special case: meta expression key */ struct proto_hdr_template { const char *token; const struct datatype *dtype; uint16_t offset; uint16_t len; + enum nft_meta_keys meta_key; }; #define PROTO_HDR_TEMPLATE(__token, __dtype, __offset, __len) \ @@ -46,6 +49,14 @@ struct proto_hdr_template { .len = (__len), \ } +#define PROTO_META_TEMPLATE(__token, __dtype, __key, __len) \ + { \ + .token = (__token), \ + .dtype = (__dtype), \ + .meta_key = (__key), \ + .len = (__len), \ + } + #define PROTO_UPPER_MAX 16 #define PROTO_HDRS_MAX 20 diff --git a/src/payload.c b/src/payload.c index 0ef3c791..04a3455e 100644 --- a/src/payload.c +++ b/src/payload.c @@ -187,7 +187,11 @@ int payload_gen_dependency(struct eval_ctx *ctx, const struct expr *expr, desc->name, expr->payload.desc->name); tmpl = &desc->templates[desc->protocol_key]; - left = payload_expr_alloc(&expr->location, desc, desc->protocol_key); + if (tmpl->meta_key) + left = meta_expr_alloc(&expr->location, tmpl->meta_key); + else + left = payload_expr_alloc(&expr->location, desc, desc->protocol_key); + right = constant_expr_alloc(&expr->location, tmpl->dtype, BYTEORDER_HOST_ENDIAN, tmpl->len, &protocol); |