diff options
| author | Ana Rey <anarey@gmail.com> | 2014-06-13 14:08:27 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 12:19:33 +0200 |
| commit | 5963febc68f69a62082c8d859353058226a61103 (patch) | |
| tree | eba2912e308f3c114df5ffb09a29c359bb01c520 /src/expr | |
| parent | 338d6438cf0fe6bf74dff6154d006816dc8c3a57 (diff) | |
expr: nat: Use nft_rule_expr_set_* in the xml
Code refactoring to use nft_rule_expr_set_* in parse xml functions. Also,
It renames some variables for code readability reasons and It converts some
variables from int to uint32_t.
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr')
| -rw-r--r-- | src/expr/nat.c | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/src/expr/nat.c b/src/expr/nat.c index 42f2b49..46d5ed7 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -259,10 +259,10 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre struct nft_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_nat *nat = nft_expr_data(e); const char *nat_type; - int family, nat_type_value; - uint32_t reg; + uint32_t family, nat_type_value; + uint32_t reg_addr_min, reg_addr_max; + uint32_t reg_proto_min, reg_proto_max; nat_type = nft_mxml_str_parse(tree, "type", MXML_DESCEND_FIRST, NFT_XML_MAND, err); @@ -272,9 +272,7 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre nat_type_value = nft_str2nat(nat_type); if (nat_type_value < 0) return -1; - - nat->type = nat_type_value; - e->flags |= (1 << NFT_EXPR_NAT_TYPE); + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_TYPE, nat_type_value); family = nft_mxml_family_parse(tree, "family", MXML_DESCEND_FIRST, NFT_XML_MAND, err); @@ -282,37 +280,27 @@ static int nft_rule_expr_nat_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre mxmlDelete(tree); return -1; } + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_FAMILY, family); - nat->family = family; - e->flags |= (1 << NFT_EXPR_NAT_FAMILY); - - if (nft_mxml_reg_parse(tree, "sreg_addr_min", ®, - MXML_DESCEND, NFT_XML_MAND, err) != 0) + if (nft_mxml_reg_parse(tree, "sreg_addr_min", ®_addr_min, + MXML_DESCEND, NFT_XML_MAND, err) < 0) return -1; + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MIN, reg_addr_min); - nat->sreg_addr_min = reg; - e->flags |= (1 << NFT_EXPR_NAT_REG_ADDR_MIN); - - if (nft_mxml_reg_parse(tree, "sreg_addr_max", ®, - MXML_DESCEND, NFT_XML_MAND, err) != 0) + if (nft_mxml_reg_parse(tree, "sreg_addr_max", ®_addr_max, + MXML_DESCEND, NFT_XML_MAND, err) < 0) return -1; + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MAX, reg_addr_max); - nat->sreg_addr_max = reg; - e->flags |= (1 << NFT_EXPR_NAT_REG_ADDR_MAX); - - if (nft_mxml_reg_parse(tree, "sreg_proto_min", ®, - MXML_DESCEND, NFT_XML_MAND, err) != 0) + if (nft_mxml_reg_parse(tree, "sreg_proto_min", ®_proto_min, + MXML_DESCEND, NFT_XML_MAND, err) < 0) return -1; + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MIN, reg_proto_min); - nat->sreg_proto_min = reg; - e->flags |= (1 << NFT_EXPR_NAT_REG_PROTO_MIN); - - if (nft_mxml_reg_parse(tree, "sreg_proto_max", ®, - MXML_DESCEND, NFT_XML_MAND, err) != 0) + if (nft_mxml_reg_parse(tree, "sreg_proto_max", ®_proto_max, + MXML_DESCEND, NFT_XML_MAND, err) < 0) return -1; - - nat->sreg_proto_max = reg; - e->flags |= (1 << NFT_EXPR_NAT_REG_PROTO_MAX); + nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg_proto_max); return 0; #else |