Module Name: src
Committed By: rmind
Date: Sat Apr 14 19:01:22 UTC 2012
Modified Files:
src/sys/net/npf: npf.h npf_impl.h npf_mbuf.c npf_ncode.h
src/sys/rump/dev/lib/libnpf: Makefile
Log Message:
Update rumpdev_npf; use WARNS=4.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/net/npf/npf.h
cvs rdiff -u -r1.12 -r1.13 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.6 -r1.7 src/sys/net/npf/npf_mbuf.c \
src/sys/net/npf/npf_ncode.h
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libnpf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.15 src/sys/net/npf/npf.h:1.16
--- src/sys/net/npf/npf.h:1.15 Sun Mar 11 18:27:59 2012
+++ src/sys/net/npf/npf.h Sat Apr 14 19:01:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.15 2012/03/11 18:27:59 rmind Exp $ */
+/* $NetBSD: npf.h,v 1.16 2012/04/14 19:01:21 rmind Exp $ */
/*-
* Copyright (c) 2009-2011 The NetBSD Foundation, Inc.
@@ -45,10 +45,6 @@
#include <netinet/in_systm.h>
#include <netinet/in.h>
-#ifdef _NPF_TESTING
-#include "testing.h"
-#endif
-
#define NPF_VERSION 4
/*
@@ -62,7 +58,7 @@ typedef uint8_t npf_netmask_t;
#define NPF_MAX_NETMASK (128)
#define NPF_NO_NETMASK ((npf_netmask_t)~0)
-#if defined(_KERNEL) || defined(_NPF_TESTING)
+#if defined(_KERNEL)
/* Network buffer. */
typedef void nbuf_t;
Index: src/sys/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.12 src/sys/net/npf/npf_impl.h:1.13
--- src/sys/net/npf/npf_impl.h:1.12 Sun Mar 11 18:27:59 2012
+++ src/sys/net/npf/npf_impl.h Sat Apr 14 19:01:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.12 2012/03/11 18:27:59 rmind Exp $ */
+/* $NetBSD: npf_impl.h,v 1.13 2012/04/14 19:01:21 rmind Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#ifndef _NPF_IMPL_H_
#define _NPF_IMPL_H_
-#if !defined(_KERNEL) && !defined(_NPF_TESTING)
+#if !defined(_KERNEL)
#error "Kernel-level header only"
#endif
@@ -51,10 +51,6 @@
#include "npf.h"
#include "npf_ncode.h"
-#ifdef _NPF_TESTING
-#include "testing.h"
-#endif
-
#ifdef _NPF_DEBUG
#define NPF_PRINTF(x) printf x
#else
Index: src/sys/net/npf/npf_mbuf.c
diff -u src/sys/net/npf/npf_mbuf.c:1.6 src/sys/net/npf/npf_mbuf.c:1.7
--- src/sys/net/npf/npf_mbuf.c:1.6 Tue Jan 18 20:33:46 2011
+++ src/sys/net/npf/npf_mbuf.c Sat Apr 14 19:01:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_mbuf.c,v 1.6 2011/01/18 20:33:46 rmind Exp $ */
+/* $NetBSD: npf_mbuf.c,v 1.7 2012/04/14 19:01:21 rmind Exp $ */
/*-
* Copyright (c) 2009-2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.6 2011/01/18 20:33:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.7 2012/04/14 19:01:21 rmind Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -117,7 +117,7 @@ nbuf_rw_datum(const int wr, struct mbuf
/* Current offset in mbuf. */
off = (uintptr_t)n_ptr - mtod(m, uintptr_t);
- KASSERT(off < m->m_len);
+ KASSERT(off < (u_int)m->m_len);
wmark = m->m_len;
/* Is datum overlapping? */
@@ -153,7 +153,7 @@ nbuf_rw_datum(const int wr, struct mbuf
off = 0;
}
KASSERT(n_ptr == d || mtod(m, uint8_t *) == d);
- KASSERT(len <= m->m_len);
+ KASSERT(len <= (u_int)m->m_len);
/* Non-overlapping case: fetch the actual data. */
if (wr == NBUF_DATA_WRITE) {
Index: src/sys/net/npf/npf_ncode.h
diff -u src/sys/net/npf/npf_ncode.h:1.6 src/sys/net/npf/npf_ncode.h:1.7
--- src/sys/net/npf/npf_ncode.h:1.6 Sat Mar 10 22:22:38 2012
+++ src/sys/net/npf/npf_ncode.h Sat Apr 14 19:01:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ncode.h,v 1.6 2012/03/10 22:22:38 christos Exp $ */
+/* $NetBSD: npf_ncode.h,v 1.7 2012/04/14 19:01:21 rmind Exp $ */
/*-
* Copyright (c) 2009-2010 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include "npf.h"
-#if defined(_KERNEL) || defined(_NPF_TESTING)
+#if defined(_KERNEL)
/*
* N-code processing, validation & building.
*/
Index: src/sys/rump/dev/lib/libnpf/Makefile
diff -u src/sys/rump/dev/lib/libnpf/Makefile:1.1 src/sys/rump/dev/lib/libnpf/Makefile:1.2
--- src/sys/rump/dev/lib/libnpf/Makefile:1.1 Thu Oct 14 22:39:30 2010
+++ src/sys/rump/dev/lib/libnpf/Makefile Sat Apr 14 19:01:22 2012
@@ -1,16 +1,21 @@
-# $NetBSD: Makefile,v 1.1 2010/10/14 22:39:30 haad Exp $
+# $NetBSD: Makefile,v 1.2 2012/04/14 19:01:22 rmind Exp $
+#
+# Public Domain.
#
.PATH: ${.CURDIR}/../../../../net/npf
LIB= rumpdev_npf
-SRCS= npf.c npf_ctl.c npf_handler.c npf_instr.c npf_mbuf.c
-SRCS+= npf_processor.c npf_ruleset.c npf_tableset.c npf_inet.c
-SRCS+= npf_session.c npf_nat.c npf_alg.c
+SRCS= npf.c npf_alg.c npf_ctl.c npf_handler.c
+SRCS+= npf_inet.c npf_instr.c npf_log.c npf_mbuf.c npf_nat.c
+SRCS+= npf_processor.c npf_ruleset.c npf_rproc.c npf_sendpkt.c
+SRCS+= npf_session.c npf_state.c npf_state_tcp.c npf_tableset.c
SRCS+= component.c
+WARNS= 4
+
CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
.include <bsd.lib.mk>
