diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-10 13:35:57 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-10 18:42:37 +0100 |
commit | 6e39ecbf6aa6ca5f9a1fc999ea56bf8a5d29ea9e (patch) | |
tree | edc5b155dac4bcd58885dcd1b680776700577ff0 /src/expr/immediate.c | |
parent | 5a2a1e0447bc9dc3defe6dca75e6a54312bbb045 (diff) |
expr: data_reg: use 'reg' instead of 'data_reg'
data_reg is unnecessarily long name and it always has to be
wrapped by another data node. This will allow us to represent
data not only as registers if needed.
Get rid of 'cmpdata' and 'immediatedata' too and use 'data'
instead to wrap 'reg' so these are consistent with the bitwise
expression. No reason for such specific tag per expression.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/immediate.c')
-rw-r--r-- | src/expr/immediate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/expr/immediate.c b/src/expr/immediate.c index be70445..3d4e48c 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -186,7 +186,7 @@ nft_rule_expr_immediate_json_parse(struct nft_rule_expr *e, json_t *root, if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, ®, err) == 0) nft_rule_expr_set_u32(e, NFT_EXPR_IMM_DREG, reg); - datareg_type = nft_jansson_data_reg_parse(root, "immediatedata", + datareg_type = nft_jansson_data_reg_parse(root, "data", &imm->data, err); if (datareg_type >= 0) { switch (datareg_type) { @@ -223,7 +223,7 @@ nft_rule_expr_immediate_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, NFT_XML_MAND, err) == 0) nft_rule_expr_set_u32(e, NFT_EXPR_IMM_DREG, reg); - datareg_type = nft_mxml_data_reg_parse(tree, "immediatedata", + datareg_type = nft_mxml_data_reg_parse(tree, "data", &imm->data, NFT_XML_MAND, err); if (datareg_type >= 0) { switch (datareg_type) { |