Module Name: src
Committed By: ozaki-r
Date: Fri Apr 15 01:35:26 UTC 2016
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/include/opt: opt_rumpkernel.h pppoe.h
src/sys/rump/librump/rumpnet: net_stub.c
src/sys/rump/net: Makefile.rumpnetcomp
src/sys/rump/net/lib/libnet: Makefile
Added Files:
src/sys/rump/net/lib/libpppoe: Makefile PPPOE.ioconf pppoe_component.c
Log Message:
Rump-ify if_pppoe
>From s-yamaguchi@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.768 -r1.769 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2029 -r1.2030 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.287 -r1.288 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.130 -r1.131 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/opt/opt_rumpkernel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/opt/pppoe.h
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpnet/net_stub.c
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r1.27 -r1.28 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libpppoe/Makefile \
src/sys/rump/net/lib/libpppoe/PPPOE.ioconf \
src/sys/rump/net/lib/libpppoe/pppoe_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.768 src/distrib/sets/lists/base/shl.mi:1.769
--- src/distrib/sets/lists/base/shl.mi:1.768 Mon Apr 11 08:44:40 2016
+++ src/distrib/sets/lists/base/shl.mi Fri Apr 15 01:35:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.768 2016/04/11 08:44:40 roy Exp $
+# $NetBSD: shl.mi,v 1.769 2016/04/15 01:35:25 ozaki-r Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -721,6 +721,9 @@
./usr/lib/librumpnet_npf.so base-rump-shlib rump
./usr/lib/librumpnet_npf.so.0 base-rump-shlib rump
./usr/lib/librumpnet_npf.so.0.0 base-rump-shlib rump
+./usr/lib/librumpnet_pppoe.so base-rump-shlib rump
+./usr/lib/librumpnet_pppoe.so.0 base-rump-shlib rump
+./usr/lib/librumpnet_pppoe.so.0.0 base-rump-shlib rump
./usr/lib/librumpnet_shmif.so base-rump-shlib rump
./usr/lib/librumpnet_shmif.so.0 base-rump-shlib rump
./usr/lib/librumpnet_shmif.so.0.0 base-rump-shlib rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2029 src/distrib/sets/lists/comp/mi:1.2030
--- src/distrib/sets/lists/comp/mi:1.2029 Sun Apr 10 19:05:50 2016
+++ src/distrib/sets/lists/comp/mi Fri Apr 15 01:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2029 2016/04/10 19:05:50 roy Exp $
+# $NetBSD: mi,v 1.2030 2016/04/15 01:35:26 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3547,6 +3547,8 @@
./usr/lib/librumpnet_npf.a comp-c-lib rump
./usr/lib/librumpnet_npf_p.a comp-c-lib rump,profile
./usr/lib/librumpnet_p.a comp-c-proflib compatfile,rump,profile
+./usr/lib/librumpnet_pppoe.a comp-c-lib rump
+./usr/lib/librumpnet_pppoe_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_shmif.a comp-c-lib rump
./usr/lib/librumpnet_shmif_p.a comp-c-proflib rump,profile
./usr/lib/librumpnet_sockin.a comp-c-lib rump
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.287 src/distrib/sets/lists/comp/shl.mi:1.288
--- src/distrib/sets/lists/comp/shl.mi:1.287 Wed Mar 16 05:32:09 2016
+++ src/distrib/sets/lists/comp/shl.mi Fri Apr 15 01:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.287 2016/03/16 05:32:09 mrg Exp $
+# $NetBSD: shl.mi,v 1.288 2016/04/15 01:35:26 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -226,6 +226,7 @@
./usr/lib/librumpnet_netmpls_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_npf_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_pic.a comp-c-piclib compatfile,picinstall,rump
+./usr/lib/librumpnet_pppoe_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_shmif_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_sockin_pic.a comp-c-piclib picinstall,rump
./usr/lib/librumpnet_tap_pic.a comp-c-piclib picinstall,rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.151 src/distrib/sets/lists/debug/mi:1.152
--- src/distrib/sets/lists/debug/mi:1.151 Sun Apr 10 21:45:33 2016
+++ src/distrib/sets/lists/debug/mi Fri Apr 15 01:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.151 2016/04/10 21:45:33 kamil Exp $
+# $NetBSD: mi,v 1.152 2016/04/15 01:35:26 ozaki-r 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
@@ -218,6 +218,7 @@
./usr/lib/librumpnet_netinet_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_netmpls_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_npf_g.a comp-c-debuglib debuglib,rump
+./usr/lib/librumpnet_pppoe_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_shmif_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_sockin_g.a comp-c-debuglib debuglib,rump
./usr/lib/librumpnet_tap_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.130 src/distrib/sets/lists/debug/shl.mi:1.131
--- src/distrib/sets/lists/debug/shl.mi:1.130 Mon Apr 11 17:00:36 2016
+++ src/distrib/sets/lists/debug/shl.mi Fri Apr 15 01:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.130 2016/04/11 17:00:36 martin Exp $
+# $NetBSD: shl.mi,v 1.131 2016/04/15 01:35:26 ozaki-r Exp $
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libc.so.12.201.debug comp-sys-debug debug,dynamicroot
@@ -244,6 +244,7 @@
./usr/libdata/debug/usr/lib/librumpnet_netinet.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_netinet6.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_netmpls.so.0.0.debug comp-rump-debug debug,rump
+./usr/libdata/debug/usr/lib/librumpnet_pppoe.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_npf.so.0.0.debug comp-rump-debug debug,npf,rump
./usr/libdata/debug/usr/lib/librumpnet_shmif.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpnet_sockin.so.0.0.debug comp-rump-debug debug,rump
Index: src/sys/rump/include/opt/opt_rumpkernel.h
diff -u src/sys/rump/include/opt/opt_rumpkernel.h:1.4 src/sys/rump/include/opt/opt_rumpkernel.h:1.5
--- src/sys/rump/include/opt/opt_rumpkernel.h:1.4 Thu Jan 7 21:04:27 2016
+++ src/sys/rump/include/opt/opt_rumpkernel.h Fri Apr 15 01:35:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_rumpkernel.h,v 1.4 2016/01/07 21:04:27 pooka Exp $ */
+/* $NetBSD: opt_rumpkernel.h,v 1.5 2016/04/15 01:35:26 ozaki-r Exp $ */
#ifndef __NetBSD__
#define __NetBSD__
@@ -29,3 +29,5 @@
#define WSEMUL_NO_DUMB
#define WSEMUL_VT100
+
+#define PPPOE_SERVER
Index: src/sys/rump/include/opt/pppoe.h
diff -u src/sys/rump/include/opt/pppoe.h:1.1 src/sys/rump/include/opt/pppoe.h:1.2
--- src/sys/rump/include/opt/pppoe.h:1.1 Mon Aug 24 23:04:42 2015
+++ src/sys/rump/include/opt/pppoe.h Fri Apr 15 01:35:26 2016
@@ -1,3 +1,3 @@
-/* $NetBSD: pppoe.h,v 1.1 2015/08/24 23:04:42 pooka Exp $ */
+/* $NetBSD: pppoe.h,v 1.2 2016/04/15 01:35:26 ozaki-r Exp $ */
-/* dummy */
+#define NPPPOE 1
Index: src/sys/rump/librump/rumpnet/net_stub.c
diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.21 src/sys/rump/librump/rumpnet/net_stub.c:1.22
--- src/sys/rump/librump/rumpnet/net_stub.c:1.21 Tue Dec 2 14:34:19 2014
+++ src/sys/rump/librump/rumpnet/net_stub.c Fri Apr 15 01:35:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: net_stub.c,v 1.21 2014/12/02 14:34:19 ozaki-r Exp $ */
+/* $NetBSD: net_stub.c,v 1.22 2016/04/15 01:35:26 ozaki-r Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.21 2014/12/02 14:34:19 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.22 2016/04/15 01:35:26 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/protosw.h>
@@ -60,6 +60,10 @@ __weak_alias(agr_input,rumpnet_stub);
__weak_alias(ieee8023ad_lacp_input,rumpnet_stub);
__weak_alias(ieee8023ad_marker_input,rumpnet_stub);
+/* pppoe */
+__weak_alias(pppoe_input,rumpnet_stub);
+__weak_alias(pppoedisc_input,rumpnet_stub);
+
struct ifnet_head ifnet_list;
int
Index: src/sys/rump/net/Makefile.rumpnetcomp
diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.13 src/sys/rump/net/Makefile.rumpnetcomp:1.14
--- src/sys/rump/net/Makefile.rumpnetcomp:1.13 Sun Nov 15 16:54:16 2015
+++ src/sys/rump/net/Makefile.rumpnetcomp Fri Apr 15 01:35:26 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.rumpnetcomp,v 1.13 2015/11/15 16:54:16 pooka Exp $
+# $NetBSD: Makefile.rumpnetcomp,v 1.14 2016/04/15 01:35:26 ozaki-r Exp $
#
.include <bsd.own.mk>
RUMPNETCOMP= agr bridge net net80211 netbt netinet netinet6
-RUMPNETCOMP+= gif netmpls npf local shmif tap
+RUMPNETCOMP+= gif netmpls npf local pppoe shmif tap
.if ${MKSLJIT} != "no" || make(rumpdescribe)
RUMPNETCOMP+= bpfjit
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.27 src/sys/rump/net/lib/libnet/Makefile:1.28
--- src/sys/rump/net/lib/libnet/Makefile:1.27 Mon Oct 19 16:16:38 2015
+++ src/sys/rump/net/lib/libnet/Makefile Fri Apr 15 01:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/10/19 16:16:38 pooka Exp $
+# $NetBSD: Makefile,v 1.28 2016/04/15 01:35:26 ozaki-r Exp $
#
@@ -10,7 +10,8 @@ COMMENT=Network interface and routing su
IOCONF= NET.ioconf
# iffy stuff
SRCS= if.c if_loop.c route.c rtsock.c raw_usrreq.c \
- raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c
+ raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c \
+ if_spppsubr.c
SRCS+= if_43.c pfil.c
SRCS+= if_llatbl.c
SRCS+= net_component.c
Added files:
Index: src/sys/rump/net/lib/libpppoe/Makefile
diff -u /dev/null src/sys/rump/net/lib/libpppoe/Makefile:1.1
--- /dev/null Fri Apr 15 01:35:26 2016
+++ src/sys/rump/net/lib/libpppoe/Makefile Fri Apr 15 01:35:26 2016
@@ -0,0 +1,13 @@
+
+.PATH: ${.CURDIR}/../../../../net
+
+LIB= rumpnet_pppoe
+COMPONENT= PPP over Ethernet protocol network interface
+
+IOCONF= PPPOE.ioconf
+SRCS= if_pppoe.c
+
+SRCS+= pppoe_component.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libpppoe/PPPOE.ioconf
diff -u /dev/null src/sys/rump/net/lib/libpppoe/PPPOE.ioconf:1.1
--- /dev/null Fri Apr 15 01:35:26 2016
+++ src/sys/rump/net/lib/libpppoe/PPPOE.ioconf Fri Apr 15 01:35:26 2016
@@ -0,0 +1,6 @@
+
+ioconf pppoe
+
+include "conf/files"
+
+pseudo-device pppoe
Index: src/sys/rump/net/lib/libpppoe/pppoe_component.c
diff -u /dev/null src/sys/rump/net/lib/libpppoe/pppoe_component.c:1.1
--- /dev/null Fri Apr 15 01:35:26 2016
+++ src/sys/rump/net/lib/libpppoe/pppoe_component.c Fri Apr 15 01:35:26 2016
@@ -0,0 +1,13 @@
+
+#include <sys/cdefs.h>
+
+#include <sys/param.h>
+
+#include <rump-sys/kern.h>
+
+int pppoeattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+ pppoeattach(0);
+}
