CVS commit: src/sys/rump/net/lib/libnpf

2018-10-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 29 15:37:45 UTC 2018

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
Back to using _NPF_TESTING now that it does not change the semantics of
the calls, but only adds extra functionality.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.25 src/sys/rump/net/lib/libnpf/Makefile:1.26
--- src/sys/rump/net/lib/libnpf/Makefile:1.25	Fri Oct 26 19:34:32 2018
+++ src/sys/rump/net/lib/libnpf/Makefile	Mon Oct 29 11:37:45 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.25 2018/10/26 23:34:32 christos Exp $
+#	$NetBSD: Makefile,v 1.26 2018/10/29 15:37:45 christos Exp $
 #
 # Public Domain.
 #
@@ -32,11 +32,10 @@ SRCS+=	npf_component.c
 .include 
 
 CPPFLAGS+=	-I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
-CPPFLAGS+=	-D_NPF_RUMP
 
-#.if ${RUMP_NPF_TESTING:Uyes} == "yes"
-#CPPFLAGS+=	-D_NPF_TESTING
-#.endif
+.if ${RUMP_NPF_TESTING:Uyes} == "yes"
+CPPFLAGS+=	-D_NPF_TESTING
+.endif
 
 .include 
 .include 



CVS commit: src/sys/rump/net/lib/libnpf

2018-10-26 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Oct 26 23:34:33 UTC 2018

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
add an _NPF_RUMP define to expose the sampling function.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.24 src/sys/rump/net/lib/libnpf/Makefile:1.25
--- src/sys/rump/net/lib/libnpf/Makefile:1.24	Fri Oct 26 02:23:02 2018
+++ src/sys/rump/net/lib/libnpf/Makefile	Fri Oct 26 19:34:32 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2018/10/26 06:23:02 kre Exp $
+#	$NetBSD: Makefile,v 1.25 2018/10/26 23:34:32 christos Exp $
 #
 # Public Domain.
 #
@@ -32,10 +32,11 @@ SRCS+=	npf_component.c
 .include 
 
 CPPFLAGS+=	-I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+CPPFLAGS+=	-D_NPF_RUMP
 
-.if ${RUMP_NPF_TESTING:Uyes} == "yes"
-CPPFLAGS+=	-D_NPF_TESTING
-.endif
+#.if ${RUMP_NPF_TESTING:Uyes} == "yes"
+#CPPFLAGS+=	-D_NPF_TESTING
+#.endif
 
 .include 
 .include 



CVS commit: src/sys/rump/net/lib/libnpf

2018-10-26 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri Oct 26 06:23:02 UTC 2018

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
Revert previous (unbreak build) - for now anyway.

It turns out _NPF_TESTING is needed for the (rump only) function
npf_state_setsampler() in sys/net/npf/npf_state.c


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.23 src/sys/rump/net/lib/libnpf/Makefile:1.24
--- src/sys/rump/net/lib/libnpf/Makefile:1.23	Fri Oct 26 01:33:33 2018
+++ src/sys/rump/net/lib/libnpf/Makefile	Fri Oct 26 06:23:02 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2018/10/26 01:33:33 christos Exp $
+#	$NetBSD: Makefile,v 1.24 2018/10/26 06:23:02 kre Exp $
 #
 # Public Domain.
 #
@@ -33,9 +33,9 @@ SRCS+=	npf_component.c
 
 CPPFLAGS+=	-I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
 
-#.if ${RUMP_NPF_TESTING:Uyes} == "yes"
-#CPPFLAGS+=	-D_NPF_TESTING
-#.endif
+.if ${RUMP_NPF_TESTING:Uyes} == "yes"
+CPPFLAGS+=	-D_NPF_TESTING
+.endif
 
 .include 
 .include 



CVS commit: src/sys/rump/net/lib/libnpf

2018-10-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Oct 26 01:33:33 UTC 2018

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
Comment out _NPF_TESTING (really should be removed)


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.22 src/sys/rump/net/lib/libnpf/Makefile:1.23
--- src/sys/rump/net/lib/libnpf/Makefile:1.22	Thu Oct 25 20:38:52 2018
+++ src/sys/rump/net/lib/libnpf/Makefile	Thu Oct 25 21:33:33 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2018/10/26 00:38:52 christos Exp $
+#	$NetBSD: Makefile,v 1.23 2018/10/26 01:33:33 christos Exp $
 #
 # Public Domain.
 #
@@ -33,9 +33,9 @@ SRCS+=	npf_component.c
 
 CPPFLAGS+=	-I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
 
-.if ${RUMP_NPF_TESTING:Uyes} == "yes"
-CPPFLAGS+=	-D_NPF_TESTING
-.endif
+#.if ${RUMP_NPF_TESTING:Uyes} == "yes"
+#CPPFLAGS+=	-D_NPF_TESTING
+#.endif
 
 .include 
 .include 



CVS commit: src/sys/rump/net/lib/libnpf

2018-10-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Oct 26 00:38:52 UTC 2018

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
need libnvpair


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.21 src/sys/rump/net/lib/libnpf/Makefile:1.22
--- src/sys/rump/net/lib/libnpf/Makefile:1.21	Sat Sep 29 10:41:36 2018
+++ src/sys/rump/net/lib/libnpf/Makefile	Thu Oct 25 20:38:52 2018
@@ -1,11 +1,13 @@
-#	$NetBSD: Makefile,v 1.21 2018/09/29 14:41:36 rmind Exp $
+#	$NetBSD: Makefile,v 1.22 2018/10/26 00:38:52 christos Exp $
 #
 # Public Domain.
 #
 
 NOLINT=		# defined
+S=${.CURDIR}/../../../../
+
+.PATH:	${S}/net/npf ${S}/external/bsd/libnv/dist
 
-.PATH:	${.CURDIR}/../../../../net/npf
 
 LIB=	rumpnet_npf
 COMMENT=NPF packet filter
@@ -17,6 +19,8 @@ SRCS+=	npf_ruleset.c npf_conn.c npf_conn
 SRCS+=	npf_state.c npf_state_tcp.c npf_tableset.c
 SRCS+=	lpm.c npf_sendpkt.c npf_worker.c npf_os.c npf_ifaddr.c
 
+SRCS+=	nvlist.c nvpair.c nv_kern_netbsd.c dnvlist.c
+
 SRCS+=	if_npflog.c
 
 SRCS+=	npf_alg_icmp.c



CVS commit: src/sys/rump/net/lib/libnpf

2016-12-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Dec  9 02:50:06 UTC 2016

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
remove ptree add lpm


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.17 src/sys/rump/net/lib/libnpf/Makefile:1.18
--- src/sys/rump/net/lib/libnpf/Makefile:1.17	Tue Jan 26 18:12:19 2016
+++ src/sys/rump/net/lib/libnpf/Makefile	Thu Dec  8 21:50:06 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2016/01/26 23:12:19 pooka Exp $
+#	$NetBSD: Makefile,v 1.18 2016/12/09 02:50:06 christos Exp $
 #
 # Public Domain.
 #
@@ -15,7 +15,7 @@ SRCS=	npf.c npf_alg.c npf_conf.c npf_ctl
 SRCS+=	npf_bpf.c npf_if.c npf_inet.c npf_mbuf.c npf_nat.c
 SRCS+=	npf_ruleset.c npf_conn.c npf_conndb.c npf_rproc.c 
 SRCS+=	npf_state.c npf_state_tcp.c npf_tableset.c
-SRCS+=	npf_tableset_ptree.c npf_sendpkt.c npf_worker.c
+SRCS+=	lpm.c npf_sendpkt.c npf_worker.c
 
 SRCS+=	if_npflog.c
 



CVS commit: src/sys/rump/net/lib/libnpf

2014-04-04 Thread Nicolas Joly
Module Name:src
Committed By:   njoly
Date:   Fri Apr  4 13:57:33 UTC 2014

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
No lint for rumpnet npf library.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.12 src/sys/rump/net/lib/libnpf/Makefile:1.13
--- src/sys/rump/net/lib/libnpf/Makefile:1.12	Thu Mar 13 02:07:24 2014
+++ src/sys/rump/net/lib/libnpf/Makefile	Fri Apr  4 13:57:33 2014
@@ -1,8 +1,10 @@
-#	$NetBSD: Makefile,v 1.12 2014/03/13 02:07:24 pooka Exp $
+#	$NetBSD: Makefile,v 1.13 2014/04/04 13:57:33 njoly Exp $
 #
 # Public Domain.
 #
 
+NOLINT=		# defined
+
 .PATH:	${.CURDIR}/../../../../net/npf
 
 LIB=	rumpnet_npf



CVS commit: src/sys/rump/net/lib/libnpf

2014-03-12 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Thu Mar 13 02:07:24 UTC 2014

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile
Added Files:
src/sys/rump/net/lib/libnpf: npf_component.c
Removed Files:
src/sys/rump/net/lib/libnpf: component.c

Log Message:
rename component.c - npf_component.c


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/lib/libnpf/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/rump/net/lib/libnpf/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnpf/npf_component.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.11 src/sys/rump/net/lib/libnpf/Makefile:1.12
--- src/sys/rump/net/lib/libnpf/Makefile:1.11	Mon Mar  3 19:09:52 2014
+++ src/sys/rump/net/lib/libnpf/Makefile	Thu Mar 13 02:07:24 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2014/03/03 19:09:52 pooka Exp $
+#	$NetBSD: Makefile,v 1.12 2014/03/13 02:07:24 pooka Exp $
 #
 # Public Domain.
 #
@@ -17,7 +17,7 @@ SRCS+=	npf_alg_icmp.c
 
 SRCS+=	npf_ext_log.c npf_ext_normalize.c npf_ext_rndblock.c
 
-SRCS+=	component.c
+SRCS+=	npf_component.c
 
 .include bsd.own.mk
 

Added files:

Index: src/sys/rump/net/lib/libnpf/npf_component.c
diff -u /dev/null src/sys/rump/net/lib/libnpf/npf_component.c:1.1
--- /dev/null	Thu Mar 13 02:07:24 2014
+++ src/sys/rump/net/lib/libnpf/npf_component.c	Thu Mar 13 02:07:24 2014
@@ -0,0 +1,35 @@
+/*	$NetBSD: npf_component.c,v 1.1 2014/03/13 02:07:24 pooka Exp $	*/
+
+/*
+ * Public Domain.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: npf_component.c,v 1.1 2014/03/13 02:07:24 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/stat.h
+
+#include rump_private.h
+#include rump_vfs_private.h
+
+extern const struct cdevsw npf_cdevsw;
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET)
+{
+	devmajor_t bmajor = NODEVMAJOR, cmajor = NODEVMAJOR;
+	int error;
+
+	error = devsw_attach(npf, NULL, bmajor, npf_cdevsw, cmajor);
+	if (error) {
+		panic(npf attach failed: %d, error);
+	}
+
+	error = rump_vfs_makeonedevnode(S_IFCHR, /dev/npf, cmajor, 0);
+	if (error) {
+		panic(npf device node creation failed: %d, error);
+	}
+	devsw_detach(NULL, npf_cdevsw);
+}



CVS commit: src/sys/rump/net/lib/libnpf

2014-03-03 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar  3 14:01:30 UTC 2014

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
For now, make it possible to not specify -D_NPF_TESTING by compiling
with RUMP_NPF_TESTING_=no.  This in turn makes it possible to use npf
in a rump kernel for real packet filtering instead of just testing.

no change to default


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.9 src/sys/rump/net/lib/libnpf/Makefile:1.10
--- src/sys/rump/net/lib/libnpf/Makefile:1.9	Fri Nov  8 00:38:27 2013
+++ src/sys/rump/net/lib/libnpf/Makefile	Mon Mar  3 14:01:30 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2013/11/08 00:38:27 rmind Exp $
+#	$NetBSD: Makefile,v 1.10 2014/03/03 14:01:30 pooka Exp $
 #
 # Public Domain.
 #
@@ -19,7 +19,9 @@ SRCS+=	npf_ext_log.c npf_ext_normalize.c
 
 SRCS+=	component.c
 
+.if ${RUMP_NPF_TESTING:Uyes} == yes
 CPPFLAGS+=	-D_NPF_TESTING
+.endif
 CPPFLAGS+=	-I${.CURDIR}/../../../librump/rumpvfs
 
 .include bsd.lib.mk



CVS commit: src/sys/rump/net/lib/libnpf

2014-03-03 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Mar  3 19:09:52 UTC 2014

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
also include bsd.own.mk, so value for RUMP_NPF_TESTING can come from mk.conf


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.10 src/sys/rump/net/lib/libnpf/Makefile:1.11
--- src/sys/rump/net/lib/libnpf/Makefile:1.10	Mon Mar  3 14:01:30 2014
+++ src/sys/rump/net/lib/libnpf/Makefile	Mon Mar  3 19:09:52 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2014/03/03 14:01:30 pooka Exp $
+#	$NetBSD: Makefile,v 1.11 2014/03/03 19:09:52 pooka Exp $
 #
 # Public Domain.
 #
@@ -19,6 +19,8 @@ SRCS+=	npf_ext_log.c npf_ext_normalize.c
 
 SRCS+=	component.c
 
+.include bsd.own.mk
+
 .if ${RUMP_NPF_TESTING:Uyes} == yes
 CPPFLAGS+=	-D_NPF_TESTING
 .endif



CVS commit: src/sys/rump/net/lib/libnpf

2014-02-25 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Wed Feb 26 02:39:29 UTC 2014

Modified Files:
src/sys/rump/net/lib/libnpf: component.c

Log Message:
Run constructor as part of network faction bootstrap, not device
(rumpdev no longer necessary)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnpf/component.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/net/lib/libnpf/component.c
diff -u src/sys/rump/net/lib/libnpf/component.c:1.2 src/sys/rump/net/lib/libnpf/component.c:1.3
--- src/sys/rump/net/lib/libnpf/component.c:1.2	Sun Mar 10 21:01:19 2013
+++ src/sys/rump/net/lib/libnpf/component.c	Wed Feb 26 02:39:29 2014
@@ -1,11 +1,11 @@
-/*	$NetBSD: component.c,v 1.2 2013/03/10 21:01:19 christos Exp $	*/
+/*	$NetBSD: component.c,v 1.3 2014/02/26 02:39:29 pooka Exp $	*/
 
 /*
  * Public Domain.
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: component.c,v 1.2 2013/03/10 21:01:19 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.3 2014/02/26 02:39:29 pooka Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -17,7 +17,7 @@ __KERNEL_RCSID(0, $NetBSD: component.c,
 
 extern const struct cdevsw npf_cdevsw;
 
-RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+RUMP_COMPONENT(RUMP_COMPONENT_NET)
 {
 	devmajor_t bmajor = NODEVMAJOR, cmajor = NODEVMAJOR;
 	int error;



CVS commit: src/sys/rump/net/lib/libnpf

2013-03-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Mar 12 21:12:47 UTC 2013

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
normali{s,z}e


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.5 src/sys/rump/net/lib/libnpf/Makefile:1.6
--- src/sys/rump/net/lib/libnpf/Makefile:1.5	Sun Mar 10 17:01:19 2013
+++ src/sys/rump/net/lib/libnpf/Makefile	Tue Mar 12 17:12:47 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2013/03/10 21:01:19 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2013/03/12 21:12:47 christos Exp $
 #
 # Public Domain.
 #
@@ -16,7 +16,7 @@ SRCS+=	if_npflog.c
 
 SRCS+=	npf_alg_icmp.c
 
-SRCS+=	npf_ext_log.c npf_ext_normalise.c npf_ext_rndblock.c
+SRCS+=	npf_ext_log.c npf_ext_normalize.c npf_ext_rndblock.c
 
 SRCS+=	component.c
 



CVS commit: src/sys/rump/net/lib/libnpf

2013-03-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun Mar 10 21:01:19 UTC 2013

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile component.c

Log Message:
remember to detach and add if_npflog module


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/net/lib/libnpf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnpf/component.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.4 src/sys/rump/net/lib/libnpf/Makefile:1.5
--- src/sys/rump/net/lib/libnpf/Makefile:1.4	Fri Feb  8 22:35:34 2013
+++ src/sys/rump/net/lib/libnpf/Makefile	Sun Mar 10 17:01:19 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2013/02/09 03:35:34 rmind Exp $
+#	$NetBSD: Makefile,v 1.5 2013/03/10 21:01:19 christos Exp $
 #
 # Public Domain.
 #
@@ -12,6 +12,7 @@ SRCS+=	npf_inet.c npf_instr.c npf_mbuf.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
 SRCS+=	npf_tableset.c npf_tableset_ptree.c
+SRCS+=	if_npflog.c
 
 SRCS+=	npf_alg_icmp.c
 

Index: src/sys/rump/net/lib/libnpf/component.c
diff -u src/sys/rump/net/lib/libnpf/component.c:1.1 src/sys/rump/net/lib/libnpf/component.c:1.2
--- src/sys/rump/net/lib/libnpf/component.c:1.1	Tue Aug 14 18:31:44 2012
+++ src/sys/rump/net/lib/libnpf/component.c	Sun Mar 10 17:01:19 2013
@@ -1,11 +1,11 @@
-/*	$NetBSD: component.c,v 1.1 2012/08/14 22:31:44 rmind Exp $	*/
+/*	$NetBSD: component.c,v 1.2 2013/03/10 21:01:19 christos Exp $	*/
 
 /*
  * Public Domain.
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: component.c,v 1.1 2012/08/14 22:31:44 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.2 2013/03/10 21:01:19 christos Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -31,4 +31,5 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 	if (error) {
 		panic(npf device node creation failed: %d, error);
 	}
+	devsw_detach(NULL, npf_cdevsw);
 }



CVS commit: src/sys/rump/net/lib/libnpf

2012-11-21 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Wed Nov 21 11:03:13 UTC 2012

Modified Files:
src/sys/rump/net/lib/libnpf: Makefile

Log Message:
This component is not WARNS3 clean (example: it includes socketvar.h
which does signed-unsigned comparison in an inline function).  Why it
compiled at all is one of those marvels of compiler technology.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/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/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.2 src/sys/rump/net/lib/libnpf/Makefile:1.3
--- src/sys/rump/net/lib/libnpf/Makefile:1.2	Sun Sep 16 13:47:42 2012
+++ src/sys/rump/net/lib/libnpf/Makefile	Wed Nov 21 11:03:13 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2012/09/16 13:47:42 rmind Exp $
+#	$NetBSD: Makefile,v 1.3 2012/11/21 11:03:13 pooka Exp $
 #
 # Public Domain.
 #
@@ -19,8 +19,6 @@ SRCS+=	npf_ext_log.c npf_ext_normalise.c
 
 SRCS+=	component.c
 
-WARNS=	5
-
 CPPFLAGS+=	-D_NPF_TESTING
 CPPFLAGS+=	-I${.CURDIR}/../../../librump/rumpvfs