summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/expr/bitwise.c4
-rw-r--r--src/expr/byteorder.c6
-rw-r--r--src/expr/ct.c2
-rw-r--r--src/expr/exthdr.c3
-rw-r--r--src/expr/immediate.c2
-rw-r--r--src/expr/lookup.c4
-rw-r--r--src/expr/meta.c2
-rw-r--r--src/expr/nat.c16
-rw-r--r--src/expr/payload.c2
-rw-r--r--src/internal.h3
-rw-r--r--src/jansson.c3
11 files changed, 21 insertions, 26 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index dc424b5..11738a7 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -187,12 +187,12 @@ nft_rule_expr_bitwise_json_parse(struct nft_rule_expr *e, json_t *root)
struct nft_expr_bitwise *bitwise = nft_expr_data(e);
uint32_t reg, len;
- if (nft_jansson_value_parse_reg(root, "sreg", NFT_TYPE_U32, &reg) == -1)
+ if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_SREG, reg);
- if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) == -1)
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_DREG, reg);
diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 9fea753..0277812 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -201,14 +201,12 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root)
uint32_t uval32;
int ntoh;
- if (nft_jansson_value_parse_reg(root, "sreg", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, uval32);
- if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, uval32);
diff --git a/src/expr/ct.c b/src/expr/ct.c
index 78575f2..4655a96 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -186,7 +186,7 @@ static int nft_rule_expr_ct_json_parse(struct nft_rule_expr *e, json_t *root)
uint8_t dir;
int key;
- if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, reg);
diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 2c71462..af9d6bf 100644
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -200,8 +200,7 @@ nft_rule_expr_exthdr_json_parse(struct nft_rule_expr *e, json_t *root)
uint32_t uval32;
int type;
- if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32,
- &uval32) != 0)
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &uval32) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_EXTHDR_DREG, uval32);
diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index d548b75..0556999 100644
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -185,7 +185,7 @@ nft_rule_expr_immediate_json_parse(struct nft_rule_expr *e, json_t *root)
int datareg_type;
uint32_t reg;
- if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_IMM_DREG, reg);
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index cbc4d42..56ab253 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -155,12 +155,12 @@ nft_rule_expr_lookup_json_parse(struct nft_rule_expr *e, json_t *root)
nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name);
- if (nft_jansson_value_parse_reg(root, "sreg", NFT_TYPE_U32, &reg) != 0)
+ if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, reg);
- if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, reg);
diff --git a/src/expr/meta.c b/src/expr/meta.c
index bbe5496..d914569 100644
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -167,7 +167,7 @@ static int nft_rule_expr_meta_json_parse(struct nft_rule_expr *e, json_t *root)
uint32_t reg;
int key;
- if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_META_DREG, reg);
diff --git a/src/expr/nat.c b/src/expr/nat.c
index 6cde333..1ebecda 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -223,26 +223,26 @@ static int nft_rule_expr_nat_json_parse(struct nft_rule_expr *e, json_t *root)
nft_rule_expr_set_u32(e, NFT_EXPR_NAT_FAMILY, val32);
- if (nft_jansson_value_parse_reg(root, "sreg_addr_min", NFT_TYPE_U32,
- &reg) != 0)
+ if (nft_jansson_parse_reg(root, "sreg_addr_min", NFT_TYPE_U32,
+ &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MIN, reg);
- if (nft_jansson_value_parse_reg(root, "sreg_addr_max", NFT_TYPE_U32,
- &reg) != 0)
+ if (nft_jansson_parse_reg(root, "sreg_addr_max", NFT_TYPE_U32,
+ &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MAX, reg);
- if (nft_jansson_value_parse_reg(root, "sreg_proto_min", NFT_TYPE_U32,
- &reg) != 0)
+ if (nft_jansson_parse_reg(root, "sreg_proto_min", NFT_TYPE_U32,
+ &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MIN, reg);
- if (nft_jansson_value_parse_reg(root, "sreg_proto_max", NFT_TYPE_U32,
- &reg) != 0)
+ if (nft_jansson_parse_reg(root, "sreg_proto_max", NFT_TYPE_U32,
+ &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg);
diff --git a/src/expr/payload.c b/src/expr/payload.c
index 2345649..38362c4 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -201,7 +201,7 @@ nft_rule_expr_payload_json_parse(struct nft_rule_expr *e, json_t *root)
uint32_t reg, uval32;
int base;
- if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+ if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
return -1;
nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, reg);
diff --git a/src/internal.h b/src/internal.h
index 3e77191..6698962 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -53,8 +53,7 @@ void nft_jansson_free_root(json_t *root);
int nft_jansson_parse_family(json_t *root, void *out);
int nft_jansson_str2num(json_t *root, const char *tag, int base, void *out,
enum nft_type type);
-int nft_jansson_value_parse_reg(json_t *root, const char *tag,
- int type, void *out);
+int nft_jansson_parse_reg(json_t *root, const char *tag, int type, void *out);
struct nft_rule_expr *nft_jansson_expr_parse(json_t *root);
union nft_data_reg;
int nft_jansson_data_reg_parse(json_t *root, const char *tag,
diff --git a/src/jansson.c b/src/jansson.c
index a2ccebd..682b74b 100644
--- a/src/jansson.c
+++ b/src/jansson.c
@@ -125,8 +125,7 @@ int nft_jansson_parse_family(json_t *root, void *out)
return 0;
}
-int nft_jansson_value_parse_reg(json_t *root, const char *tag, int type,
- void *out)
+int nft_jansson_parse_reg(json_t *root, const char *tag, int type, void *out)
{
if (nft_jansson_parse_val(root, tag, type, out) < 0)
return -1;