[src/trunk]: src Move and rename librumpdev_npf to librumpnet_npf.

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

details:   https://anonhg.NetBSD.org/src/rev/8cb4a8fbd65c
branches:  trunk
changeset: 781006:8cb4a8fbd65c
user:      rmind <rmind%NetBSD.org@localhost>
date:      Tue Aug 14 22:31:43 2012 +0000

description:
Move and rename librumpdev_npf to librumpnet_npf.

diffstat:

 sys/rump/dev/lib/libnpf/Makefile      |  24 ------------------------
 sys/rump/dev/lib/libnpf/component.c   |  35 -----------------------------------
 sys/rump/dev/lib/libnpf/shlib_version |   4 ----
 sys/rump/net/lib/libnpf/Makefile      |  24 ++++++++++++++++++++++++
 sys/rump/net/lib/libnpf/component.c   |  34 ++++++++++++++++++++++++++++++++++
 sys/rump/net/lib/libnpf/shlib_version |   4 ++++
 usr.sbin/npf/npftest/Makefile         |   2 +-
 usr.sbin/npf/npftest/README           |   4 ++--
 8 files changed, 65 insertions(+), 66 deletions(-)

diffs (179 lines):

diff -r 15975d6596f8 -r 8cb4a8fbd65c sys/rump/dev/lib/libnpf/Makefile
--- a/sys/rump/dev/lib/libnpf/Makefile  Tue Aug 14 21:12:59 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#      $NetBSD: Makefile,v 1.4 2012/07/15 00:22:59 rmind Exp $
-#
-# Public Domain.
-#
-
-.PATH: ${.CURDIR}/../../../../net/npf
-
-LIB=   rumpdev_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>
diff -r 15975d6596f8 -r 8cb4a8fbd65c sys/rump/dev/lib/libnpf/component.c
--- a/sys/rump/dev/lib/libnpf/component.c       Tue Aug 14 21:12:59 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*     $NetBSD: component.c,v 1.1 2010/10/14 22:39:30 haad Exp $       */
-
-/*
- * Public Domain.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2010/10/14 22:39:30 haad Exp $");
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/stat.h>
-
-#include "rump_private.h"
-#include "rump_dev_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 attaching failed: %d", error);
-       }
-
-       error = rump_vfs_makeonedevnode(S_IFCHR, "/dev/npf", cmajor, 0);
-       if (error) {
-               panic("npf device node creation failed: %d", error);
-       }
-}
diff -r 15975d6596f8 -r 8cb4a8fbd65c sys/rump/dev/lib/libnpf/shlib_version
--- a/sys/rump/dev/lib/libnpf/shlib_version     Tue Aug 14 21:12:59 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#      $NetBSD: shlib_version,v 1.1 2010/10/14 22:39:30 haad Exp $
-#
-major=0
-minor=0
diff -r 15975d6596f8 -r 8cb4a8fbd65c sys/rump/net/lib/libnpf/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libnpf/Makefile  Tue Aug 14 22:31:43 2012 +0000
@@ -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>
diff -r 15975d6596f8 -r 8cb4a8fbd65c sys/rump/net/lib/libnpf/component.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libnpf/component.c       Tue Aug 14 22:31:43 2012 +0000
@@ -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);
+       }
+}
diff -r 15975d6596f8 -r 8cb4a8fbd65c sys/rump/net/lib/libnpf/shlib_version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libnpf/shlib_version     Tue Aug 14 22:31:43 2012 +0000
@@ -0,0 +1,4 @@
+#      $NetBSD: shlib_version,v 1.1 2012/08/14 22:31:44 rmind Exp $
+#
+major=0
+minor=0
diff -r 15975d6596f8 -r 8cb4a8fbd65c usr.sbin/npf/npftest/Makefile
--- a/usr.sbin/npf/npftest/Makefile     Tue Aug 14 21:12:59 2012 +0000
+++ b/usr.sbin/npf/npftest/Makefile     Tue Aug 14 22:31:43 2012 +0000
@@ -12,7 +12,7 @@
 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
 
diff -r 15975d6596f8 -r 8cb4a8fbd65c usr.sbin/npf/npftest/README
--- a/usr.sbin/npf/npftest/README       Tue Aug 14 21:12:59 2012 +0000
+++ b/usr.sbin/npf/npftest/README       Tue Aug 14 22:31:43 2012 +0000
@@ -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 @@
 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