Module Name: src
Committed By: rmind
Date: Tue Aug 14 22:31:44 UTC 2012
Modified Files:
src/usr.sbin/npf/npftest: Makefile README
Added Files:
src/sys/rump/net/lib/libnpf: Makefile component.c shlib_version
Removed Files:
src/sys/rump/dev/lib/libnpf: Makefile component.c shlib_version
Log Message:
Move and rename librumpdev_npf to librumpnet_npf.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r0 src/sys/rump/dev/lib/libnpf/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libnpf/component.c \
src/sys/rump/dev/lib/libnpf/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnpf/Makefile \
src/sys/rump/net/lib/libnpf/component.c \
src/sys/rump/net/lib/libnpf/shlib_version
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/npftest/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/npf/npftest/README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npftest/Makefile
diff -u src/usr.sbin/npf/npftest/Makefile:1.2 src/usr.sbin/npf/npftest/Makefile:1.3
--- src/usr.sbin/npf/npftest/Makefile:1.2 Wed May 30 21:38:04 2012
+++ src/usr.sbin/npf/npftest/Makefile Tue Aug 14 22:31:44 2012
@@ -12,7 +12,7 @@ LIBNPFTEST!= cd ${.CURDIR}/libnpftest &&
DPADD+= ${LIBNPFTEST}/libnpftest.a
LDADD+= -L${LIBNPFTEST} -lnpftest
-LDADD+= -lrump -lrumpvfs -lrumpnet -lrumpnet_net -lrumpdev_npf
+LDADD+= -lrump -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_npf
LDADD+= -lpcap -lprop -lpthread
Index: src/usr.sbin/npf/npftest/README
diff -u src/usr.sbin/npf/npftest/README:1.1 src/usr.sbin/npf/npftest/README:1.2
--- src/usr.sbin/npf/npftest/README:1.1 Sun Aug 12 03:35:14 2012
+++ src/usr.sbin/npf/npftest/README Tue Aug 14 22:31:44 2012
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.1 2012/08/12 03:35:14 rmind Exp $
+$NetBSD: README,v 1.2 2012/08/14 22:31:44 rmind Exp $
npftest - a tool for regression testing and debugging NPF.
It uses RUMP framework to run NPF kernel module in the userspace.
@@ -23,7 +23,7 @@ Update RUMP libraries once the kernel si
cd src/sys/net/npf
sudo make includes
-cd src/sys/rump/dev/lib/libnpf
+cd src/sys/rump/net/lib/libnpf
make distclean
MKDEBUG=yes MKDEBUGLIB=yes DBG=-g make -j8
sudo MKDEBUG=yes MKDEBUGLIB=yes DBG=-g make install
Added files:
Index: src/sys/rump/net/lib/libnpf/Makefile
diff -u /dev/null src/sys/rump/net/lib/libnpf/Makefile:1.1
--- /dev/null Tue Aug 14 22:31:44 2012
+++ src/sys/rump/net/lib/libnpf/Makefile Tue Aug 14 22:31:44 2012
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2012/08/14 22:31:44 rmind Exp $
+#
+# Public Domain.
+#
+
+.PATH: ${.CURDIR}/../../../../net/npf
+
+LIB= rumpnet_npf
+
+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
+SRCS+= npf_tableset.c npf_tableset_ptree.c
+
+SRCS+= component.c
+
+WARNS= 4
+
+CPPFLAGS+= -D_NPF_TESTING
+CPPFLAGS+= -I${.CURDIR}/../../../librump/rumpvfs
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libnpf/component.c
diff -u /dev/null src/sys/rump/net/lib/libnpf/component.c:1.1
--- /dev/null Tue Aug 14 22:31:44 2012
+++ src/sys/rump/net/lib/libnpf/component.c Tue Aug 14 22:31:44 2012
@@ -0,0 +1,34 @@
+/* $NetBSD: component.c,v 1.1 2012/08/14 22:31:44 rmind Exp $ */
+
+/*
+ * Public Domain.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2012/08/14 22:31:44 rmind 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_DEV)
+{
+ 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);
+ }
+}
Index: src/sys/rump/net/lib/libnpf/shlib_version
diff -u /dev/null src/sys/rump/net/lib/libnpf/shlib_version:1.1
--- /dev/null Tue Aug 14 22:31:44 2012
+++ src/sys/rump/net/lib/libnpf/shlib_version Tue Aug 14 22:31:44 2012
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2012/08/14 22:31:44 rmind Exp $
+#
+major=0
+minor=0
