 @@ -1,14 +1,14 @@
-/*	$NetBSD: npf.c,v 1.4 2011/02/02 02:20:25 rmind Exp $	*/
+/*	$NetBSD: npf.c,v 1.5 2011/04/25 22:16:21 yamt Exp $	*/
 /*-
  * Copyright (c) 2009-2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This material is based upon work partially supported by The
  * NetBSD Foundation under a contract with Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,51 +24,52 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * NPF main: dynamic load/initialisation and unload routines.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.4 2011/02/02 02:20:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.5 2011/04/25 22:16:21 yamt Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/atomic.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/lwp.h>
 #include <sys/module.h>
 #include <sys/percpu.h>
 #include <sys/rwlock.h>
 #include <sys/socketvar.h>
 #include <sys/uio.h>
 #include "npf_impl.h"
 /*
  * Module and device structures.
  */
 MODULE(MODULE_CLASS_MISC, npf, NULL);
 void		npfattach(int);
 static int	npf_fini(void);
 static int	npf_dev_open(dev_t, int, int, lwp_t *);
 static int	npf_dev_close(dev_t, int, int, lwp_t *);
 static int	npf_dev_ioctl(dev_t, u_long, void *, int, lwp_t *);
 static int	npf_dev_poll(dev_t, int, lwp_t *);
 static int	npf_dev_read(dev_t, struct uio *, int);
 typedef struct {
 	npf_ruleset_t *		n_rules;
 	npf_tableset_t *	n_tables;
 	npf_ruleset_t *		n_nat_rules;
 } npf_core_t;
 static void	npf_core_destroy(npf_core_t *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: npf_state.c,v 1.3 2011/01/18 20:33:46 rmind Exp $	*/
+/*	$NetBSD: npf_state.c,v 1.4 2011/04/25 22:16:21 yamt Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This material is based upon work partially supported by The
  * NetBSD Foundation under a contract with Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * NPF state engine to track connections.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_state.c,v 1.3 2011/01/18 20:33:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_state.c,v 1.4 2011/04/25 22:16:21 yamt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_fsm.h>
 #include "npf_impl.h"
 /* TCP session expiration table. */
 @@ -394,30 +394,28 @@ npf_state_inspect(const npf_cache_t *npc
  * npf_state_etime: return session expiration time according to the state.
  */
 int
 npf_state_etime(const npf_state_t *nst, const int proto)
+{
 	const int state = nst->nst_state;
 	if (__predict_true(proto == IPPROTO_TCP)) {
 		return tcp_expire_table[state];
+	}
 	return expire_table[proto];
+}
 #if defined(DDB) || defined(_NPF_TESTING)
 void
 npf_state_dump(npf_state_t *nst)
+{
 #if defined(DDB) || defined(_NPF_TESTING)
 	npf_tcpstate_t *fst = &nst->nst_tcpst[0], *tst = &nst->nst_tcpst[1];
 	printf("\tstate (%p) %d:\n\t\t"
 	    "F { seqend %u ackend %u mwin %u wscale %u }\n\t\t"
 	    "T { seqend %u ackend %u mwin %u wscale %u }\n",
 	    nst, nst->nst_state,
 	    fst->nst_seqend, fst->nst_ackend, fst->nst_maxwin, fst->nst_wscale,
 	    tst->nst_seqend, tst->nst_ackend, tst->nst_maxwin, tst->nst_wscale
 	);
 #endif
+}