Module Name: src
Committed By: knakahara
Date: Thu Feb 16 08:39:10 UTC 2017
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/sys/rump/net: Makefile.rumpnetcomp
src/sys/rump/net/lib/libnet: net_component.c
Added Files:
src/sys/rump/include/opt: l2tp.h
src/sys/rump/net/lib/libl2tp: L2TP.ioconf Makefile l2tp_component.c
Log Message:
l2tp(4) support rump.
To generate a diff of this commit:
cvs rdiff -u -r1.802 -r1.803 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2109 -r1.2110 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.300 -r1.301 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.199 -r1.200 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.162 -r1.163 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/opt/l2tp.h
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libl2tp/L2TP.ioconf \
src/sys/rump/net/lib/libl2tp/Makefile \
src/sys/rump/net/lib/libl2tp/l2tp_component.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/net/lib/libnet/net_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/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.802 src/distrib/sets/lists/base/shl.mi:1.803
--- src/distrib/sets/lists/base/shl.mi:1.802 Fri Feb 10 18:11:56 2017
+++ src/distrib/sets/lists/base/shl.mi Thu Feb 16 08:39:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.802 2017/02/10 18:11:56 christos Exp $
+# $NetBSD: shl.mi,v 1.803 2017/02/16 08:39:10 knakahara Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -700,6 +700,9 @@
./usr/lib/librumpnet_gif.so base-rump-shlib rump
./usr/lib/librumpnet_gif.so.0 base-rump-shlib rump
./usr/lib/librumpnet_gif.so.0.0 base-rump-shlib rump
+./usr/lib/librumpnet_l2tp.so base-rump-shlib rump
+./usr/lib/librumpnet_l2tp.so.0 base-rump-shlib rump
+./usr/lib/librumpnet_l2tp.so.0.0 base-rump-shlib rump
./usr/lib/librumpnet_local.so base-rump-shlib rump
./usr/lib/librumpnet_local.so.0 base-rump-shlib rump
./usr/lib/librumpnet_local.so.0.0 base-rump-shlib rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2109 src/distrib/sets/lists/comp/mi:1.2110
--- src/distrib/sets/lists/comp/mi:1.2109 Thu Feb 16 08:12:43 2017
+++ src/distrib/sets/lists/comp/mi Thu Feb 16 08:39:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2109 2017/02/16 08:12:43 knakahara Exp $
+# $NetBSD: mi,v 1.2110 2017/02/16 08:39:10 knakahara Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3552,6 +3552,8 @@
./usr/lib/librumpnet_bridge_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_gif.a comp-c-lib rump
./usr/lib/librumpnet_gif_p.a comp-c-proflib rump,profile
+./usr/lib/librumpnet_l2tp.a comp-c-lib rump
+./usr/lib/librumpnet_l2tp_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_local.a comp-c-lib rump
./usr/lib/librumpnet_local_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_net.a comp-c-lib rump
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.300 src/distrib/sets/lists/comp/shl.mi:1.301
--- src/distrib/sets/lists/comp/shl.mi:1.300 Wed Feb 8 03:44:40 2017
+++ src/distrib/sets/lists/comp/shl.mi Thu Feb 16 08:39:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.300 2017/02/08 03:44:40 kamil Exp $
+# $NetBSD: shl.mi,v 1.301 2017/02/16 08:39:10 knakahara Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -218,6 +218,7 @@
./usr/lib/librumpnet_bpfjit_pic.a comp-c-piclib picinstall,rump,sljit
./usr/lib/librumpnet_bridge_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_gif_pic.a comp-c-piclib picinstall,rump
+./usr/lib/librumpnet_l2tp_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_local_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_net80211_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_net_pic.a comp-c-piclib picinstall,rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.199 src/distrib/sets/lists/debug/mi:1.200
--- src/distrib/sets/lists/debug/mi:1.199 Thu Feb 9 03:29:55 2017
+++ src/distrib/sets/lists/debug/mi Thu Feb 16 08:39:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.199 2017/02/09 03:29:55 christos Exp $
+# $NetBSD: mi,v 1.200 2017/02/16 08:39:10 knakahara Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -210,6 +210,7 @@
./usr/lib/librumpnet_bridge_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_g.a comp-c-debuglib debuglib,compatfile,rump
./usr/lib/librumpnet_gif_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpnet_l2tp_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_local_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_net80211_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_net_g.a comp-c-debuglib debuglib,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.162 src/distrib/sets/lists/debug/shl.mi:1.163
--- src/distrib/sets/lists/debug/shl.mi:1.162 Fri Feb 10 18:11:56 2017
+++ src/distrib/sets/lists/debug/shl.mi Thu Feb 16 08:39:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.162 2017/02/10 18:11:56 christos Exp $
+# $NetBSD: shl.mi,v 1.163 2017/02/16 08:39:10 knakahara Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
@@ -240,6 +240,7 @@
./usr/libdata/debug/usr/lib/librumpnet_bpfjit.so.0.0.debug comp-rump-debug debug,rump,sljit
./usr/libdata/debug/usr/lib/librumpnet_bridge.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_gif.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpnet_l2tp.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_local.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_net.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_net80211.so.0.0.debug comp-rump-debug debug,rump
Index: src/sys/rump/net/Makefile.rumpnetcomp
diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.16 src/sys/rump/net/Makefile.rumpnetcomp:1.17
--- src/sys/rump/net/Makefile.rumpnetcomp:1.16 Sat Nov 26 03:17:58 2016
+++ src/sys/rump/net/Makefile.rumpnetcomp Thu Feb 16 08:39:10 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.rumpnetcomp,v 1.16 2016/11/26 03:17:58 ozaki-r Exp $
+# $NetBSD: Makefile.rumpnetcomp,v 1.17 2017/02/16 08:39:10 knakahara Exp $
#
.include <bsd.own.mk>
RUMPNETCOMP= agr bridge net net80211 netbt netinet netinet6
-RUMPNETCOMP+= gif netmpls npf local pppoe shmif tap tun vlan
+RUMPNETCOMP+= gif netmpls npf l2tp local pppoe shmif tap tun vlan
.if ${MKSLJIT} != "no" || make(rumpdescribe)
RUMPNETCOMP+= bpfjit
Index: src/sys/rump/net/lib/libnet/net_component.c
diff -u src/sys/rump/net/lib/libnet/net_component.c:1.8 src/sys/rump/net/lib/libnet/net_component.c:1.9
--- src/sys/rump/net/lib/libnet/net_component.c:1.8 Tue Jan 17 02:02:27 2017
+++ src/sys/rump/net/lib/libnet/net_component.c Thu Feb 16 08:39:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: net_component.c,v 1.8 2017/01/17 02:02:27 christos Exp $ */
+/* $NetBSD: net_component.c,v 1.9 2017/02/16 08:39:10 knakahara Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_component.c,v 1.8 2017/01/17 02:02:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_component.c,v 1.9 2017/02/16 08:39:10 knakahara Exp $");
#include <sys/param.h>
#include <sys/domain.h>
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: net_componen
#include <net/if.h>
#include <net/if_llatbl.h>
+#include <net/if_l2tp.h>
#include <net/route.h>
#include <rump-sys/kern.h>
Added files:
Index: src/sys/rump/include/opt/l2tp.h
diff -u /dev/null src/sys/rump/include/opt/l2tp.h:1.1
--- /dev/null Thu Feb 16 08:39:11 2017
+++ src/sys/rump/include/opt/l2tp.h Thu Feb 16 08:39:10 2017
@@ -0,0 +1,3 @@
+/* $NetBSD: l2tp.h,v 1.1 2017/02/16 08:39:10 knakahara Exp $ */
+
+/* dummy */
Index: src/sys/rump/net/lib/libl2tp/L2TP.ioconf
diff -u /dev/null src/sys/rump/net/lib/libl2tp/L2TP.ioconf:1.1
--- /dev/null Thu Feb 16 08:39:11 2017
+++ src/sys/rump/net/lib/libl2tp/L2TP.ioconf Thu Feb 16 08:39:10 2017
@@ -0,0 +1,7 @@
+# $NetBSD: L2TP.ioconf,v 1.1 2017/02/16 08:39:10 knakahara Exp $
+
+ioconf l2tp
+
+include "conf/files"
+
+pseudo-device l2tp
Index: src/sys/rump/net/lib/libl2tp/Makefile
diff -u /dev/null src/sys/rump/net/lib/libl2tp/Makefile:1.1
--- /dev/null Thu Feb 16 08:39:11 2017
+++ src/sys/rump/net/lib/libl2tp/Makefile Thu Feb 16 08:39:10 2017
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2017/02/16 08:39:10 knakahara Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../netinet \
+ ${.CURDIR}/../../../../netinet6
+
+LIB= rumpnet_l2tp
+COMMENT= L2TPv3 interface
+
+IOCONF= L2TP.ioconf
+SRCS= if_l2tp.c in_l2tp.c in6_l2tp.c
+
+SRCS+= l2tp_component.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libl2tp/l2tp_component.c
diff -u /dev/null src/sys/rump/net/lib/libl2tp/l2tp_component.c:1.1
--- /dev/null Thu Feb 16 08:39:11 2017
+++ src/sys/rump/net/lib/libl2tp/l2tp_component.c Thu Feb 16 08:39:10 2017
@@ -0,0 +1,42 @@
+/* $NetBSD: l2tp_component.c,v 1.1 2017/02/16 08:39:10 knakahara Exp $ */
+
+/*
+ * Copyright (c) 2017 Internet Initiative Japan Inc.
+ * All rights reserved.
+ *
+ * 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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: l2tp_component.c,v 1.1 2017/02/16 08:39:10 knakahara Exp $");
+
+#include <sys/param.h>
+
+#include <rump-sys/kern.h>
+
+int l2tpattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+
+ l2tpattach(0);
+}
