summaryrefslogtreecommitdiffstats
path: root/src/jansson.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-11-10 13:35:57 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-11-10 18:42:37 +0100
commit6e39ecbf6aa6ca5f9a1fc999ea56bf8a5d29ea9e (patch)
treeedc5b155dac4bcd58885dcd1b680776700577ff0 /src/jansson.c
parent5a2a1e0447bc9dc3defe6dca75e6a54312bbb045 (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/jansson.c')
-rw-r--r--src/jansson.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jansson.c b/src/jansson.c
index 4c7968a..b17d8a9 100644
--- a/src/jansson.c
+++ b/src/jansson.c
@@ -227,10 +227,10 @@ int nft_jansson_data_reg_parse(json_t *root, const char *node_name,
if (data == NULL)
data = root;
- data = json_object_get(data, "data_reg");
+ data = json_object_get(data, "reg");
if (data == NULL) {
err->error = NFT_PARSE_EMISSINGNODE;
- err->node_name = "data_reg";
+ err->node_name = "reg";
errno = EINVAL;
return -1;
}