summaryrefslogtreecommitdiffstats
path: root/src/expr
diff options
context:
space:
mode:
Diffstat (limited to 'src/expr')
-rw-r--r--src/expr/bitwise.c2
-rw-r--r--src/expr/byteorder.c6
-rw-r--r--src/expr/cmp.c3
-rw-r--r--src/expr/counter.c6
-rw-r--r--src/expr/ct.c3
-rw-r--r--src/expr/data_reg.c3
-rw-r--r--src/expr/exthdr.c6
-rw-r--r--src/expr/limit.c6
-rw-r--r--src/expr/log.c10
-rw-r--r--src/expr/payload.c6
10 files changed, 18 insertions, 33 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 8cea075..dc424b5 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -197,7 +197,7 @@ nft_rule_expr_bitwise_json_parse(struct nft_rule_expr *e, json_t *root)
nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_DREG, reg);
- if (nft_jansson_value_parse_val(root, "len", NFT_TYPE_U32, &len) == -1)
+ if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &len) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_LEN, len);
diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index dab9061..9fea753 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -223,14 +223,12 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root)
nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh);
- if (nft_jansson_value_parse_val(root, "len", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, uval32);
- if (nft_jansson_value_parse_val(root, "size", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_val(root, "size", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, uval32);
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 71f8e60..543f774 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -182,8 +182,7 @@ static int nft_rule_expr_cmp_json_parse(struct nft_rule_expr *e, json_t *root)
uint32_t uval32;
int base;
- if (nft_jansson_value_parse_val(root, "sreg", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_val(root, "sreg", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_CMP_SREG, uval32);
diff --git a/src/expr/counter.c b/src/expr/counter.c
index 6cdd637..53dc526 100644
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -124,14 +124,12 @@ nft_rule_expr_counter_json_parse(struct nft_rule_expr *e, json_t *root)
#ifdef JSON_PARSING
uint64_t uval64;
- if (nft_jansson_value_parse_val(root, "pkts", NFT_TYPE_U64,
- &uval64) != 0)
+ if (nft_jansson_parse_val(root, "pkts", NFT_TYPE_U64, &uval64) < 0)
return -1;
nft_rule_expr_set_u64(e, NFT_EXPR_CTR_PACKETS, uval64);
- if (nft_jansson_value_parse_val(root, "bytes", NFT_TYPE_U64,
- &uval64) != 0)
+ if (nft_jansson_parse_val(root, "bytes", NFT_TYPE_U64, &uval64) < 0)
return -1;
nft_rule_expr_set_u64(e, NFT_EXPR_CTR_BYTES, uval64);
diff --git a/src/expr/ct.c b/src/expr/ct.c
index 79c4f05..78575f2 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -205,8 +205,7 @@ static int nft_rule_expr_ct_json_parse(struct nft_rule_expr *e, json_t *root)
}
if (nft_jansson_node_exist(root, "dir")) {
- if (nft_jansson_value_parse_val(root, "dir", NFT_TYPE_U8,
- &dir) != 0)
+ if (nft_jansson_parse_val(root, "dir", NFT_TYPE_U8, &dir) < 0)
return -1;
if (dir != IP_CT_DIR_ORIGINAL && dir != IP_CT_DIR_REPLY)
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index 3b6a87a..34537a7 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -60,8 +60,7 @@ static int nft_data_reg_value_json_parse(union nft_data_reg *reg, json_t *data)
int i;
char node_name[6];
- if (nft_jansson_value_parse_val(data, "len", NFT_TYPE_U8,
- &reg->len) != 0)
+ if (nft_jansson_parse_val(data, "len", NFT_TYPE_U8, &reg->len) < 0)
return -1;
for (i = 0; i < div_round_up(reg->len, sizeof(uint32_t)); i++) {
diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index b0705b5..2c71462 100644
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -216,14 +216,12 @@ nft_rule_expr_exthdr_json_parse(struct nft_rule_expr *e, json_t *root)
nft_rule_expr_set_u32(e, NFT_EXPR_EXTHDR_TYPE, type);
- if (nft_jansson_value_parse_val(root, "offset", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_val(root, "offset", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_EXTHDR_OFFSET, uval32);
- if (nft_jansson_value_parse_val(root, "len", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_EXTHDR_LEN, uval32);
diff --git a/src/expr/limit.c b/src/expr/limit.c
index d65c0a9..bd92cd1 100644
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -123,14 +123,12 @@ static int nft_rule_expr_limit_json_parse(struct nft_rule_expr *e, json_t *root)
#ifdef JSON_PARSING
uint64_t uval64;
- if (nft_jansson_value_parse_val(root, "rate", NFT_TYPE_U64,
- &uval64) != 0)
+ if (nft_jansson_parse_val(root, "rate", NFT_TYPE_U64, &uval64) < 0)
return -1;
nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_RATE, uval64);
- if (nft_jansson_value_parse_val(root, "depth", NFT_TYPE_U64,
- &uval64) != 0)
+ if (nft_jansson_parse_val(root, "depth", NFT_TYPE_U64, &uval64) < 0)
return -1;
nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_DEPTH, uval64);
diff --git a/src/expr/log.c b/src/expr/log.c
index 8858e5b..bbbd5b9 100644
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -169,20 +169,18 @@ static int nft_rule_expr_log_json_parse(struct nft_rule_expr *e, json_t *root)
nft_rule_expr_set_str(e, NFT_EXPR_LOG_PREFIX, prefix);
- if (nft_jansson_value_parse_val(root, "group", NFT_TYPE_U16,
- &uval16) != 0)
+ if (nft_jansson_parse_val(root, "group", NFT_TYPE_U16, &uval16) < 0)
return -1;
nft_rule_expr_set_u16(e, NFT_EXPR_LOG_GROUP, uval16);
- if (nft_jansson_value_parse_val(root, "snaplen", NFT_TYPE_U32,
- &snaplen) != 0)
+ if (nft_jansson_parse_val(root, "snaplen", NFT_TYPE_U32, &snaplen) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_LOG_SNAPLEN, snaplen);
- if (nft_jansson_value_parse_val(root, "qthreshold", NFT_TYPE_U16,
- &uval16) != 0)
+ if (nft_jansson_parse_val(root, "qthreshold", NFT_TYPE_U16,
+ &uval16) < 0)
return -1;
nft_rule_expr_set_u16(e, NFT_EXPR_LOG_QTHRESHOLD, uval16);
diff --git a/src/expr/payload.c b/src/expr/payload.c
index 161b0d9..2345649 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -216,14 +216,12 @@ nft_rule_expr_payload_json_parse(struct nft_rule_expr *e, json_t *root)
nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base);
- if (nft_jansson_value_parse_val(root, "offset", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_val(root, "offset", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, uval32);
- if (nft_jansson_value_parse_val(root, "len", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, uval32);