From: Máté Eckl <ecklm94@gmail.com>
Date: Wed, 6 Jun 2018 09:13:35 +0000 (+0200)
Subject: nat: Eliminate misuse of AF_*
X-Git-Tag: v0.9.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3384849c113b1ec3906c7a22cc71d708aae1218e;p=thirdparty%2Fnftables.git

nat: Eliminate misuse of AF_*

Although the value of AF_INET and NFPROTO_IPV4 is the same, the use of
AF_INET was misleading when checking the proto family.
Same with AF_INET6.

Signed-off-by: Máté Eckl <ecklm94@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/evaluate.c b/src/evaluate.c
index 22b14c97..ff75fc45 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -2402,8 +2402,8 @@ static int stmt_evaluate_reject(struct eval_ctx *ctx, struct stmt *stmt)
 static int nat_evaluate_family(struct eval_ctx *ctx, struct stmt *stmt)
 {
 	switch (ctx->pctx.family) {
-	case AF_INET:
-	case AF_INET6:
+	case NFPROTO_IPV4:
+	case NFPROTO_IPV6:
 		return 0;
 	default:
 		return stmt_error(ctx, stmt,
@@ -2418,7 +2418,7 @@ static int evaluate_addr(struct eval_ctx *ctx, struct stmt *stmt,
 	const struct datatype *dtype;
 	unsigned int len;
 
-	if (pctx->family == AF_INET) {
+	if (pctx->family == NFPROTO_IPV4) {
 		dtype = &ipaddr_type;
 		len   = 4 * BITS_PER_BYTE;
 	} else {
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 7d882eba..2c938e52 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -878,7 +878,7 @@ static void netlink_parse_nat(struct netlink_parse_ctx *ctx,
 			goto out_err;
 		}
 
-		if (family == AF_INET)
+		if (family == NFPROTO_IPV4)
 			expr_set_type(addr, &ipaddr_type, BYTEORDER_BIG_ENDIAN);
 		else
 			expr_set_type(addr, &ip6addr_type,
@@ -895,7 +895,7 @@ static void netlink_parse_nat(struct netlink_parse_ctx *ctx,
 			goto out_err;
 		}
 
-		if (family == AF_INET)
+		if (family == NFPROTO_IPV4)
 			expr_set_type(addr, &ipaddr_type, BYTEORDER_BIG_ENDIAN);
 		else
 			expr_set_type(addr, &ip6addr_type,