[src/trunk]: src/lib/libnpf npf_nat_create: fix attributes.

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ad3b442d0d22
branches:  trunk
changeset: 761613:ad3b442d0d22
user:      rmind <rmind%NetBSD.org@localhost>
date:      Wed Feb 02 15:17:37 2011 +0000

description:
npf_nat_create: fix attributes.

diffstat:

 lib/libnpf/npf.c |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r fecb7c15348b -r ad3b442d0d22 lib/libnpf/npf.c
--- a/lib/libnpf/npf.c  Wed Feb 02 15:13:33 2011 +0000
+++ b/lib/libnpf/npf.c  Wed Feb 02 15:17:37 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf.c,v 1.1 2011/02/02 02:20:25 rmind Exp $    */
+/*     $NetBSD: npf.c,v 1.2 2011/02/02 15:17:37 rmind Exp $    */
 
 /*-
  * Copyright (c) 2010-2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.1 2011/02/02 02:20:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.2 2011/02/02 15:17:37 rmind Exp $");
 
 #include <sys/types.h>
 #include <netinet/in_systm.h>
@@ -285,15 +285,15 @@
 _npf_rproc_setnorm(nl_rproc_t *rp, bool rnd, bool no_df, int minttl, int maxmss)
 {
        prop_dictionary_t rpdict = rp->nrp_dict;
-       uint32_t attr;
+       uint32_t fl;
 
        prop_dictionary_set_bool(rpdict, "randomize-id", rnd);
        prop_dictionary_set_bool(rpdict, "no-df", no_df);
        prop_dictionary_set_uint32(rpdict, "min-ttl", minttl);
        prop_dictionary_set_uint32(rpdict, "max-mss", maxmss);
 
-       prop_dictionary_get_uint32(rpdict, "flags", &attr);
-       prop_dictionary_set_uint32(rpdict, "flags", attr | NPF_RPROC_NORMALIZE);
+       prop_dictionary_get_uint32(rpdict, "flags", &fl);
+       prop_dictionary_set_uint32(rpdict, "flags", fl | NPF_RPROC_NORMALIZE);
        return 0;
 }
 
@@ -301,12 +301,12 @@
 _npf_rproc_setlog(nl_rproc_t *rp, u_int if_idx)
 {
        prop_dictionary_t rpdict = rp->nrp_dict;
-       uint32_t attr;
+       uint32_t fl;
 
        prop_dictionary_set_uint32(rpdict, "log-interface", if_idx);
 
-       prop_dictionary_get_uint32(rpdict, "flags", &attr);
-       prop_dictionary_set_uint32(rpdict, "flags", attr | NPF_RPROC_LOG);
+       prop_dictionary_get_uint32(rpdict, "flags", &fl);
+       prop_dictionary_set_uint32(rpdict, "flags", fl | NPF_RPROC_LOG);
        return 0;
 }
 
@@ -349,7 +349,7 @@
        }
 
        attr = NPF_RULE_PASS | NPF_RULE_FINAL |
-           (type == NPF_NATOUT) ? NPF_RULE_OUT : NPF_RULE_IN;
+           (type == NPF_NATOUT ? NPF_RULE_OUT : NPF_RULE_IN);
 
        /* Create a rule for NAT policy.  Next, will add translation data. */
        rl = npf_rule_create(NULL, attr, if_idx);